------------------------------------------------------------ revno: 116742 committer: martin rudalics branch nick: trunk timestamp: Wed 2014-03-12 08:28:23 +0100 message: Two adjustments in window/frame resizing. * frame.c (x_set_frame_parameters): Always calculate new sizes pixelwise to avoid potential loss when rounding. * window.el (fit-frame-to-buffer): Get maximum width from display's width instead of height. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-12 07:14:30 +0000 +++ lisp/ChangeLog 2014-03-12 07:28:23 +0000 @@ -1,3 +1,8 @@ +2014-03-12 Martin Rudalics + + * window.el (fit-frame-to-buffer): Get maximum width from + display's width instead of height. + 2014-03-12 Glenn Morris * desktop.el (desktop-restore-frames) === modified file 'lisp/window.el' --- lisp/window.el 2014-03-07 19:12:31 +0000 +++ lisp/window.el 2014-03-12 07:28:23 +0000 @@ -7043,7 +7043,7 @@ (- (* (nth 2 sizes) char-width) window-extra-width)) ((numberp max-width) (- (* max-width char-width) window-extra-width)) - (t display-height))) + (t display-width))) (min-width (cond ((numberp (nth 3 sizes)) === modified file 'src/ChangeLog' --- src/ChangeLog 2014-03-11 06:50:01 +0000 +++ src/ChangeLog 2014-03-12 07:28:23 +0000 @@ -1,3 +1,8 @@ +2014-03-12 Martin Rudalics + + * frame.c (x_set_frame_parameters): Always calculate new sizes + pixelwise to avoid potential loss when rounding. + 2014-03-11 Dmitry Antipov * xfns.c (x_set_mouse_color): Recolor vertical_drag_cursor. === modified file 'src/frame.c' --- src/frame.c 2014-02-22 21:49:10 +0000 +++ src/frame.c 2014-03-12 07:28:23 +0000 @@ -2848,14 +2848,14 @@ /* Provide default values for HEIGHT and WIDTH. */ width = (f->new_width ? (f->new_pixelwise - ? (f->new_width / FRAME_COLUMN_WIDTH (f)) - : f->new_width) - : FRAME_COLS (f)); + ? f->new_width + : (f->new_width * FRAME_COLUMN_WIDTH (f))) + : FRAME_TEXT_WIDTH (f)); height = (f->new_height ? (f->new_pixelwise - ? (f->new_height / FRAME_LINE_HEIGHT (f)) - : f->new_height) - : FRAME_LINES (f)); + ? f->new_height + : (f->new_height * FRAME_LINE_HEIGHT (f))) + : FRAME_TEXT_HEIGHT (f)); /* Process foreground_color and background_color before anything else. They are independent of other properties, but other properties (e.g., @@ -2899,12 +2899,12 @@ if (EQ (prop, Qwidth) && RANGED_INTEGERP (0, val, INT_MAX)) { size_changed = 1; - width = XFASTINT (val); + width = XFASTINT (val) * FRAME_COLUMN_WIDTH (f) ; } else if (EQ (prop, Qheight) && RANGED_INTEGERP (0, val, INT_MAX)) { size_changed = 1; - height = XFASTINT (val); + height = XFASTINT (val) * FRAME_LINE_HEIGHT (f); } else if (EQ (prop, Qtop)) top = val; @@ -2986,15 +2986,15 @@ Lisp_Object frame; /* Make this 1, eventually. */ - check_frame_size (f, &width, &height, 0); + check_frame_size (f, &width, &height, 1); XSETFRAME (frame, f); if (size_changed - && (width != FRAME_COLS (f) - || height != FRAME_LINES (f) + && (width != FRAME_TEXT_WIDTH (f) + || height != FRAME_TEXT_HEIGHT (f) || f->new_height || f->new_width)) - Fset_frame_size (frame, make_number (width), make_number (height), Qnil); + Fset_frame_size (frame, make_number (width), make_number (height), Qt); if ((!NILP (left) || !NILP (top)) && ! (left_no_change && top_no_change) ------------------------------------------------------------ revno: 116741 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-03-12 00:26:07 -0700 message: * doc/emacs/misc.texi (Saving Emacs Sessions): Make previous change slightly less brief. diff: === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2014-03-12 07:14:30 +0000 +++ doc/emacs/misc.texi 2014-03-12 07:26:07 +0000 @@ -2138,7 +2138,9 @@ their file names, major modes, buffer positions, and so on---then subsequent Emacs sessions reload the saved desktop. By default, the desktop also tries to save the frame and window configuration. -To disable this, customize @code{desktop-restore-frames} to @code{nil}. +To disable this, set @code{desktop-restore-frames} to @code{nil}. +(See that variable's documentation for some related options +that you can customize to fine-tune this behavior.) @findex desktop-save @vindex desktop-save-mode ------------------------------------------------------------ revno: 116740 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-03-12 00:20:43 -0700 message: * org.texi: Don't set txicodequoteundirected and txicodequotebacktick so that the Org Manual's style for ` and ' in code is consistent with the other Emacs manuals. This affects PDF, not .info files. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-03-12 06:52:54 +0000 +++ doc/misc/ChangeLog 2014-03-12 07:20:43 +0000 @@ -1,3 +1,9 @@ +2014-03-12 Paul Eggert + + * org.texi: Don't set txicodequoteundirected and txicodequotebacktick + so that the Org Manual's style for ` and ' in code is consistent + with the other Emacs manuals. This affects PDF, not .info files. + 2014-03-12 Glenn Morris * octave-mode.texi (Using Octave Mode): Remove outdated stuff === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2014-01-13 22:21:32 +0000 +++ doc/misc/org.texi 2014-03-12 07:20:43 +0000 @@ -4,11 +4,6 @@ @settitle The Org Manual @set VERSION 8.2.5c -@c Use proper quote and backtick for code sections in PDF output -@c Cf. Texinfo manual 14.2 -@set txicodequoteundirected -@set txicodequotebacktick - @c Version and Contact Info @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page} @set AUTHOR Carsten Dominik ------------------------------------------------------------ revno: 116739 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-03-12 00:14:30 -0700 message: Some doc edits related to desktop-restore-frames * doc/emacs/misc.texi (Saving Emacs Sessions): Be briefer about desktop's handling of frames. The manual does not need to mention every option, nor should it just repeat the doc-strings. * lisp/desktop.el (desktop-restore-frames) (desktop-restore-in-current-display, desktop-restore-forces-onscreen) (desktop-restore-reuses-frames): Doc tweaks. * etc/NEWS: Related edits. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-12 07:03:40 +0000 +++ doc/emacs/ChangeLog 2014-03-12 07:14:30 +0000 @@ -8,6 +8,9 @@ 2014-03-12 Glenn Morris + * misc.texi (Saving Emacs Sessions): Be briefer about desktop's + handling of frames. + * indent.texi (Indent Convenience): Mention electric-indent-local-mode. 2014-03-02 Xue Fuqiao === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2014-02-28 01:05:49 +0000 +++ doc/emacs/misc.texi 2014-03-12 07:14:30 +0000 @@ -2132,10 +2132,13 @@ @cindex reload files @cindex desktop +@vindex desktop-restore-frames Use the desktop library to save the state of Emacs from one session to another. Once you save the Emacs @dfn{desktop}---the buffers, their file names, major modes, buffer positions, and so on---then -subsequent Emacs sessions reload the saved desktop. +subsequent Emacs sessions reload the saved desktop. By default, +the desktop also tries to save the frame and window configuration. +To disable this, customize @code{desktop-restore-frames} to @code{nil}. @findex desktop-save @vindex desktop-save-mode @@ -2193,32 +2196,6 @@ @code{desktop-clear-preserve-buffers-regexp}, whose value is a regular expression matching the names of buffers not to kill. -@vindex desktop-restore-frames -@code{desktop-restore-frames}, enabled by default, a non-@code{nil} -means save frames (@pxref{Frames}) to desktop file. - -@vindex desktop-restore-in-current-display -If the value of @code{desktop-restore-in-current-display} is @code{t}, -frames are restored in the current display. If @code{nil} (the -default), frames are restored in their original displays if possible. -If @samp{delete}, frames on other displays are deleted instead of -restored. - -@vindex desktop-restore-reuses-frames -If the value of @code{desktop-restore-reuses-frames} is @code{t} (the -default), restoring frames will reuse existing frames. If @code{nil}, -existing frames are deleted. If @samp{:keep}, existing frames are -kept but not reused. - -@vindex desktop-restore-forces-onscreen -If the value of @code{desktop-restore-forces-onscreen} is @code{t} -(the default), offscreen frames are restored onscreen. If -@samp{:all}, frames that are partially offscreen are also forced -onscreen. @strong{Notice:} Checking of frame boundaries is -approximate. It may not reliably detect frames whose -onscreen/offscreen state depends on a few pixels, especially near the -right and/or bottom borders of the screen. - If you want to save minibuffer history from one session to another, use the @code{savehist} library. === modified file 'etc/NEWS' --- etc/NEWS 2014-03-12 06:48:20 +0000 +++ etc/NEWS 2014-03-12 07:14:30 +0000 @@ -572,10 +572,10 @@ to nil (or zero). +++ -*** `desktop-restore-frames', enabled by default, allows saving and -restoring the frame/window configuration (frameset). Additional options -`desktop-restore-in-current-display', `desktop-restore-reuses-frames' -and `desktop-restore-forces-onscreen' offer further customization. +*** Desktop now saves and restores the frame/window configuration. +To disable this, set `desktop-restore-frames' to nil. +See also related options `desktop-restore-reuses-frames', +`desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'. +++ ** New Dired minor mode `dired-hide-details-mode' toggles whether details, === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-12 06:48:20 +0000 +++ lisp/ChangeLog 2014-03-12 07:14:30 +0000 @@ -1,5 +1,9 @@ 2014-03-12 Glenn Morris + * desktop.el (desktop-restore-frames) + (desktop-restore-in-current-display, desktop-restore-forces-onscreen) + (desktop-restore-reuses-frames): Doc tweaks. + * electric.el (electric-indent-mode): Doc fix. 2014-03-12 Juanma Barranquero === modified file 'lisp/desktop.el' --- lisp/desktop.el 2014-03-11 00:46:07 +0000 +++ lisp/desktop.el 2014-03-12 07:14:30 +0000 @@ -387,15 +387,18 @@ :group 'desktop) (defcustom desktop-restore-frames t - "When non-nil, save frames to desktop file." + "When non-nil, save and restore the frame and window configuration. +See related options `desktop-restore-reuses-frames', +`desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'." :type 'boolean :group 'desktop :version "24.4") (defcustom desktop-restore-in-current-display nil - "If t, frames are restored in the current display. -If nil, frames are restored, if possible, in their original displays. -If `delete', frames on other displays are deleted instead of restored." + "Controls how restoring of frames treats displays. +If t, restores frames into the current display. +If nil, restores frames into their original displays (if possible). +If `delete', deletes frames on other displays instead of restoring them." :type '(choice (const :tag "Restore in current display" t) (const :tag "Restore in original display" nil) (const :tag "Delete frames in other displays" delete)) @@ -403,11 +406,13 @@ :version "24.4") (defcustom desktop-restore-forces-onscreen t - "If t, offscreen frames are restored onscreen instead. -If `all', frames that are partially offscreen are also forced onscreen. -NOTE: Checking of frame boundaries is only approximate and can fail -to reliably detect frames whose onscreen/offscreen state depends on a -few pixels, especially near the right / bottom borders of the screen." + "If t, restores frames that are fully offscreen onscreen instead. +If `all', also restores frames that are partially offscreen onscreen. + +Note that checking of frame boundaries is only approximate. +It can fail to reliably detect frames whose onscreen/offscreen state +depends on a few pixels, especially near the right / bottom borders +of the screen." :type '(choice (const :tag "Only fully offscreen frames" t) (const :tag "Also partially offscreen frames" all) (const :tag "Do not force frames onscreen" nil)) @@ -416,8 +421,8 @@ (defcustom desktop-restore-reuses-frames t "If t, restoring frames reuses existing frames. -If nil, existing frames are deleted. -If `keep', existing frames are kept and not reused." +If nil, deletes existing frames. +If `keep', keeps existing frames and does not reuse them." :type '(choice (const :tag "Reuse existing frames" t) (const :tag "Delete existing frames" nil) (const :tag "Keep existing frames" :keep)) ------------------------------------------------------------ revno: 116738 committer: Paul Eggert branch nick: trunk timestamp: Wed 2014-03-12 00:03:40 -0700 message: * mule.texi (International Chars): Adjust C-u C-x = description. Change it to match Emacs's current behavior. Also, change the example to use ê instead of À, as the isolated grave accent in the latter's decomposition listing was confusingly transliterated to left single quote in the PDF version of the manual. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-12 06:48:20 +0000 +++ doc/emacs/ChangeLog 2014-03-12 07:03:40 +0000 @@ -1,3 +1,11 @@ +2014-03-12 Paul Eggert + + * mule.texi (International Chars): Adjust C-u C-x = description. + Change it to match Emacs's current behavior. Also, change the + example to use ê instead of À, as the isolated grave accent in the + latter's decomposition listing was confusingly transliterated to + left single quote in the PDF version of the manual. + 2014-03-12 Glenn Morris * indent.texi (Indent Convenience): Mention electric-indent-local-mode. === modified file 'doc/emacs/mule.texi' --- doc/emacs/mule.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/mule.texi 2014-03-12 07:03:40 +0000 @@ -196,17 +196,17 @@ as belonging to the @code{ascii} character set. @item -The character's syntax and categories. +The character's script, syntax and categories. + +@item +What keys to type to input the character in the current input method +(if it supports the character). @item The character's encodings, both internally in the buffer, and externally if you were to save the file. @item -What keys to type to input the character in the current input method -(if it supports the character). - -@item If you are running Emacs on a graphical display, the font name and glyph code for the character. If you are running Emacs on a text terminal, the code(s) sent to the terminal. @@ -218,28 +218,29 @@ (@pxref{Overlays,,, elisp, the same manual}). @end itemize - Here's an example showing the Latin-1 character A with grave accent, -in a buffer whose coding system is @code{utf-8-unix}: + Here's an example, with some lines folded to fit into this manual: @smallexample position: 1 of 1 (0%), column: 0 - character: @`A (displayed as @`A) (codepoint 192, #o300, #xc0) + character: @^e (displayed as @^e) (codepoint 234, #o352, #xea) preferred charset: unicode (Unicode (ISO10646)) -code point in charset: 0xC0 - syntax: w which means: word - category: .:Base, L:Left-to-right (strong), +code point in charset: 0xEA + script: latin + syntax: w which means: word + category: .:Base, L:Left-to-right (strong), c:Chinese, j:Japanese, l:Latin, v:Viet - buffer code: #xC3 #x80 - file code: not encodable by coding system undecided-unix + to input: type "C-x 8 RET HEX-CODEPOINT" or "C-x 8 RET NAME" + buffer code: #xC3 #xAA + file code: #xC3 #xAA (encoded by coding system utf-8-unix) display: by this font (glyph code) xft:-unknown-DejaVu Sans Mono-normal-normal- - normal-*-13-*-*-*-m-0-iso10646-1 (#x82) + normal-*-15-*-*-*-m-0-iso10646-1 (#xAC) Character code properties: customize what to show - name: LATIN CAPITAL LETTER A WITH GRAVE - old-name: LATIN CAPITAL LETTER A GRAVE - general-category: Lu (Letter, Uppercase) - decomposition: (65 768) ('A' '`') + name: LATIN SMALL LETTER E WITH CIRCUMFLEX + old-name: LATIN SMALL LETTER E CIRCUMFLEX + general-category: Ll (Letter, Lowercase) + decomposition: (101 770) ('e' '^') @end smallexample @node Language Environments ------------------------------------------------------------ revno: 116737 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-03-11 23:52:54 -0700 message: * doc/misc/octave-mode.texi (Using Octave Mode): Remove outdated stuff about RET and indentation. E.g., octave-reindent-then-newline-and-indent was removed three years ago. When you delete commands, please use grep to check for references to them. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-03-03 17:15:42 +0000 +++ doc/misc/ChangeLog 2014-03-12 06:52:54 +0000 @@ -1,3 +1,8 @@ +2014-03-12 Glenn Morris + + * octave-mode.texi (Using Octave Mode): Remove outdated stuff + about RET and indentation. + 2014-03-03 Juanma Barranquero * gnus.texi: === modified file 'doc/misc/octave-mode.texi' --- doc/misc/octave-mode.texi 2014-02-27 11:59:35 +0000 +++ doc/misc/octave-mode.texi 2014-03-12 06:52:54 +0000 @@ -148,39 +148,6 @@ in one of your Emacs startup files. @end table -@c FIXME: `electric-indent-mode' is enabled by default in GNU Emacs 24.4. -A common problem is that the @key{RET} key does @emph{not} indent the -line to where the new text should go after inserting the newline. This -is because the standard Emacs convention is that @key{RET} (aka -@kbd{C-m}) just adds a newline, whereas @key{LFD} (aka @kbd{C-j}) adds a -newline and indents it. This is particularly inconvenient for users with -keyboards which do not have a special @key{LFD} key at all; in such -cases, it is typically more convenient to use @key{RET} as the @key{LFD} -key (rather than typing @kbd{C-j}). - -You can make @key{RET} do this by adding -@lisp -(define-key octave-mode-map "\C-m" - 'octave-reindent-then-newline-and-indent) -@end lisp -@noindent -to one of your Emacs startup files. Another, more generally applicable -solution is -@lisp -(defun RET-behaves-as-LFD () - (let ((x (key-binding "\C-j"))) - (local-set-key "\C-m" x))) -(add-hook 'octave-mode-hook 'RET-behaves-as-LFD) -@end lisp -@noindent -(this works for all modes by adding to the startup hooks, without -having to know the particular binding of @key{RET} in that mode!). -Similar considerations apply for using @key{M-RET} as @key{M-LFD}. As -@email{bwarsaw@@cnri.reston.va.us, Barry A. Warsaw} says in the -documentation for his @code{cc-mode}, ``This is a very common -question. @code{:-)} If you want this to be the default behavior, -don't lobby me, lobby RMS!'' - The following variables can be used to customize Octave mode. @vtable @code ------------------------------------------------------------ revno: 116736 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-03-11 23:48:20 -0700 message: * emacs/indent.texi (Indent Convenience): Mention electric-indent-local-mode. * lisp/electric.el (electric-indent-mode): Doc fix. * etc/NEWS: Related markup. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-03-09 23:55:11 +0000 +++ doc/emacs/ChangeLog 2014-03-12 06:48:20 +0000 @@ -1,3 +1,7 @@ +2014-03-12 Glenn Morris + + * indent.texi (Indent Convenience): Mention electric-indent-local-mode. + 2014-03-02 Xue Fuqiao * mark.texi (Mark): === modified file 'doc/emacs/indent.texi' --- doc/emacs/indent.texi 2014-02-27 11:59:35 +0000 +++ doc/emacs/indent.texi 2014-03-12 06:48:20 +0000 @@ -251,4 +251,5 @@ Electric Indent mode is a global minor mode that automatically indents the line after every @key{RET} you type. This mode is enabled by default. To toggle this minor mode, type @kbd{M-x -electric-indent-mode}. +electric-indent-mode}. To toggle the mode in a single buffer, +use @kbd{M-x electric-indent-local-mode}. === modified file 'etc/NEWS' --- etc/NEWS 2014-03-10 15:49:01 +0000 +++ etc/NEWS 2014-03-12 06:48:20 +0000 @@ -359,6 +359,7 @@ E.g., typing RET reindents the current line and indents the new line. `C-j' inserts a newline but does not indent. ++++ *** New buffer-local `electric-indent-local-mode'. +++ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-12 04:00:03 +0000 +++ lisp/ChangeLog 2014-03-12 06:48:20 +0000 @@ -1,3 +1,7 @@ +2014-03-12 Glenn Morris + + * electric.el (electric-indent-mode): Doc fix. + 2014-03-12 Juanma Barranquero * vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot) === modified file 'lisp/electric.el' --- lisp/electric.el 2014-03-04 04:03:34 +0000 +++ lisp/electric.el 2014-03-12 06:48:20 +0000 @@ -294,9 +294,11 @@ positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. -This is a global minor mode. When enabled, it reindents whenever -the hook `electric-indent-functions' returns non-nil, or you -insert a character from `electric-indent-chars'." +When enabled, this reindents whenever the hook `electric-indent-functions' +returns non-nil, or if you insert a character from `electric-indent-chars'. + +This is a global minor mode. To toggle the mode in a single buffer, +use `electric-indent-local-mode'." :global t :group 'electricity :initialize 'custom-initialize-delay :init-value t ------------------------------------------------------------ revno: 116735 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2014-03-12 05:00:03 +0100 message: lisp/vc/pcvs*.el: Fix typos. * lisp/vc/pcvs-defs.el (cvs-auto-remove-handled) (cvs-auto-remove-directories, cvs-default-ignore-marks) (cvs-idiff-imerge-handlers, cvs-reuse-cvs-buffer) (cvs-execute-single-dir): Fix docstring typos. * lisp/vc/pcvs-info.el (cvs-status-map, cvs-states): Fix docstring typos. (cvs-fileinfo-pp, cvs-fileinfo-from-entries): Doc fixes. * lisp/vc/pcvs-parse.el (cvs-parsed-fileinfo): Reflow docstring. * lisp/vc/pcvs-util.el (cvs-flags-query, cvs-flags-set, cvs-prefix-set): Fix docstring typos. * lisp/vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot) (cvs-checkout, cvs-mode-checkout, cvs-update-filter, cvs-mode-mark) (cvs-mode-diff-head, cvs-mode-diff-repository, cvs-mode-diff-yesterday) (cvs-mode-diff-vendor, cvs-mode-do, cvs-change-cvsroot) (cvs-dired-use-hook): Fix docstring typos. (cvs-mode-view-file-other-window, cvs-mode-byte-compile-files): Doc fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-12 02:21:09 +0000 +++ lisp/ChangeLog 2014-03-12 04:00:03 +0000 @@ -1,5 +1,28 @@ 2014-03-12 Juanma Barranquero + * vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot) + (cvs-checkout, cvs-mode-checkout, cvs-update-filter, cvs-mode-mark) + (cvs-mode-diff-head, cvs-mode-diff-repository, cvs-mode-diff-yesterday) + (cvs-mode-diff-vendor, cvs-mode-do, cvs-change-cvsroot) + (cvs-dired-use-hook): Fix docstring typos. + (cvs-mode-view-file-other-window, cvs-mode-byte-compile-files): + Doc fixes. + + * vc/pcvs-defs.el (cvs-auto-remove-handled) + (cvs-auto-remove-directories, cvs-default-ignore-marks) + (cvs-idiff-imerge-handlers, cvs-reuse-cvs-buffer) + (cvs-execute-single-dir): Fix docstring typos. + + * vc/pcvs-info.el (cvs-status-map, cvs-states): Fix docstring typos. + (cvs-fileinfo-pp, cvs-fileinfo-from-entries): Doc fixes. + + * vc/pcvs-parse.el (cvs-parsed-fileinfo): Reflow docstring. + + * vc/pcvs-util.el (cvs-flags-query, cvs-flags-set, cvs-prefix-set): + Fix docstring typos. + +2014-03-12 Juanma Barranquero + * frameset.el (frameset--jump-to-register): Add autoload; it could be called from jump-to-register after unloading the frameset package. === modified file 'lisp/vc/pcvs-defs.el' --- lisp/vc/pcvs-defs.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/pcvs-defs.el 2014-03-12 04:00:03 +0000 @@ -92,17 +92,17 @@ (defcustom cvs-auto-remove-handled nil "If up-to-date files should be acknowledged automatically. -If T, they will be removed from the *cvs* buffer after every command. -If DELAYED, they will be removed from the *cvs* buffer before every command. -If STATUS, they will only be removed after a `cvs-mode-status' command. +If t, they will be removed from the *cvs* buffer after every command. +If `delayed', they will be removed from the *cvs* buffer before every command. +If `status', they will only be removed after a `cvs-mode-status' command. Else, they will never be automatically removed from the *cvs* buffer." :group 'pcl-cvs :type '(choice (const nil) (const status) (const delayed) (const t))) (defcustom cvs-auto-remove-directories 'handled - "If ALL, directory entries will never be shown. -If HANDLED, only non-handled directories will be shown. -If EMPTY, only non-empty directories will be shown." + "If `all', directory entries will never be shown. +If `handled', only non-handled directories will be shown. +If `empty', only non-empty directories will be shown." :group 'pcl-cvs :type '(choice (const :tag "No" nil) (const all) (const handled) (const empty))) @@ -129,7 +129,7 @@ Normally they run on the files that are marked (with `cvs-mode-mark'), or the file under the cursor if no files are marked. If this variable is set to a non-nil value they will by default run on the file on the -current line. See also `cvs-invert-ignore-marks'" +current line. See also `cvs-invert-ignore-marks'." :group 'pcl-cvs :type '(boolean)) @@ -235,7 +235,7 @@ (if (fboundp 'ediff) '(cvs-ediff-diff . cvs-ediff-merge) '(cvs-emerge-diff . cvs-emerge-merge)) - "Pair of functions to be used for resp. diff'ing and merg'ing interactively." + "Pair of functions to be used for resp. diff'ing and merg'ing interactively." :group 'pcl-cvs :type '(choice (const :tag "Ediff" (cvs-ediff-diff . cvs-ediff-merge)) (const :tag "Emerge" (cvs-emerge-diff . cvs-emerge-merge)))) @@ -251,10 +251,10 @@ (defcustom cvs-reuse-cvs-buffer 'subdir "When to reuse an existing cvs buffer. Alternatives are: - CURRENT: just reuse the current buffer if it is a cvs buffer - SAMEDIR: reuse any cvs buffer displaying the same directory - SUBDIR: or reuse any cvs buffer displaying any sub- or super- directory - ALWAYS: reuse any cvs buffer." + `current': just reuse the current buffer if it is a cvs buffer + `samedir': reuse any cvs buffer displaying the same directory + `subdir': or reuse any cvs buffer displaying any sub- or super- directory + `always': reuse any cvs buffer." :group 'pcl-cvs :type '(choice (const always) (const subdir) (const samedir) (const current))) @@ -488,16 +488,16 @@ t) "Whether cvs commands should be executed a directory at a time. If a list, specifies for which commands the single-dir mode should be used. -If T, single-dir mode should be used for all operations. +If t, single-dir mode should be used for all operations. CVS versions before 1.10 did not allow passing them arguments in different -directories, so pcl-cvs checks what version you're using to determine +directories, so PCL-CVS checks what version you're using to determine whether to use the new feature or not. Sadly, even with a new cvs executable, if you connect to an older cvs server \(typically a cvs-1.9 on the server), the old restriction applies. In such -a case the sanity check made by pcl-cvs fails and you will have to manually +a case the sanity check made by PCL-CVS fails and you will have to manually set this variable to t (until the cvs server is upgraded). -When the above problem occurs, pcl-cvs should (hopefully) catch cvs' error +When the above problem occurs, PCL-CVS should (hopefully) catch cvs' error message and replace it with a message telling you to change this variable.") ;; === modified file 'lisp/vc/pcvs-info.el' --- lisp/vc/pcvs-info.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/pcvs-info.el 2014-03-12 04:00:03 +0000 @@ -142,7 +142,7 @@ (easy-mmode-defmap cvs-status-map '(([(mouse-2)] . cvs-mode-toggle-mark)) - "Local keymap for text properties of status") + "Local keymap for text properties of status.") ;; Constructor: @@ -301,8 +301,8 @@ (DEAD ) (MESSAGE)) "Fileinfo state descriptions for pcl-cvs. -This is an assoc list. Each element consists of (STATE . FUNS) -- STATE (described in `cvs-create-fileinfo') is the key +This is an assoc list. Each element consists of (STATE . FUNS): +- STATE (described in `cvs-create-fileinfo') is the key. - FUNS is the list of applicable operations. The first one (if any) should be the \"default\" action. Most of the actions have the obvious meaning. @@ -332,7 +332,7 @@ (defun cvs-fileinfo-pp (fileinfo) "Pretty print FILEINFO. Insert a printed representation in current buffer. -For use by the cookie package." +For use by the ewoc package." (cvs-check-fileinfo fileinfo) (let ((type (cvs-fileinfo->type fileinfo)) (subtype (cvs-fileinfo->subtype fileinfo))) @@ -416,7 +416,7 @@ (defun cvs-fileinfo-from-entries (dir &optional all) "List of fileinfos for DIR, extracted from CVS/Entries. -Unless ALL is optional, returns only the files that are not up-to-date. +Unless ALL is non-nil, returns only the files that are not up-to-date. DIR can also be a file." (let* ((singlefile (cond === modified file 'lisp/vc/pcvs-parse.el' --- lisp/vc/pcvs-parse.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/pcvs-parse.el 2014-03-12 04:00:03 +0000 @@ -165,13 +165,13 @@ TYPE can either be a type symbol or a cons of the form (TYPE . SUBTYPE). PATH is the filename. DIRECTORY influences the way PATH is interpreted: -- if it's a string, it denotes the directory in which PATH (which should then be +- if a string, it denotes the directory in which PATH (which should then be a plain file name with no directory component) resides. - if it's nil, the PATH should not be trusted: if it has a directory component, use it, else, assume it is relative to the current directory. -- else, the PATH should be trusted to be relative to the root - directory (i.e. if there is no directory component, it means the file - is inside the main directory). +- else, the PATH should be trusted to be relative to the root directory + (i.e. if there is no directory component, it means the file is inside + the main directory). The remaining KEYS are passed directly to `cvs-create-fileinfo'." (let ((dir directory) (file path)) === modified file 'lisp/vc/pcvs-util.el' --- lisp/vc/pcvs-util.el 2014-01-01 07:43:34 +0000 +++ lisp/vc/pcvs-util.el 2014-03-12 04:00:03 +0000 @@ -253,7 +253,7 @@ Optional argument DESC will be used for the prompt. If ARG (or a prefix argument) is nil, just use the 0th default. If it is a non-negative integer, use the corresponding default. -If it is a negative integer query for a new value of the corresponding +If it is a negative integer, query for a new value of the corresponding default and return that new value. If it is \\[universal-argument], just query and return a value without altering the defaults. @@ -286,7 +286,7 @@ (nth numarg defaults)))) (defsubst cvs-flags-set (sym index value) - "Set SYM's INDEX'th setting to VALUE." + "Set SYM's INDEXth setting to VALUE." (setf (nth index (cvs-flags-defaults (symbol-value sym))) value)) ;;;; @@ -323,7 +323,7 @@ "Set the cvs-prefix contained in SYM. If ARG is between 0 and 9, it selects the corresponding default. If ARG is negative (or \\[universal-argument] which corresponds to negative 0), - it queries the user and sets the -ARG'th default. + it queries the user and sets the -ARGth default. If ARG is greater than 9 (or \\[universal-argument] \\[universal-argument]), the (ARG mod 10)'th prefix is made persistent. If ARG is nil toggle the PREFIX's value between its 0th default and nil === modified file 'lisp/vc/pcvs.el' --- lisp/vc/pcvs.el 2014-01-28 00:39:50 +0000 +++ lisp/vc/pcvs.el 2014-03-12 04:00:03 +0000 @@ -341,11 +341,11 @@ (defun cvs-temp-buffer (&optional cmd normal nosetup) "Create a temporary buffer to run CMD in. If CMD is a string, use it to lookup `cvs-buffer-name-alist' to find -the buffer name to be used and its `major-mode'. +the buffer name to be used and its major mode. The selected window will not be changed. The new buffer will not maintain undo information and will be read-only unless NORMAL is non-nil. It will be emptied -\(unless NOSETUP is non-nil\) and its `default-directory' will be inherited +\(unless NOSETUP is non-nil) and its `default-directory' will be inherited from the current buffer." (let* ((cvs-buf (current-buffer)) (info (cdr (assoc cmd cvs-buffer-name-alist))) @@ -750,13 +750,13 @@ ARGS and DOCSTRING are the normal argument list. INTERACT is the interactive specification or nil for non-commands. -STYLE can be either SIMPLE, NOARGS or DOUBLE. It's an error for it +STYLE can be either `SIMPLE', `NOARGS' or `DOUBLE'. It's an error for it to have any other value, unless other details of the function make it clear what alternative to use. -- SIMPLE will get all the interactive arguments from the original buffer. -- NOARGS will get all the arguments from the *cvs* buffer and will +- `SIMPLE' will get all the interactive arguments from the original buffer. +- `NOARGS' will get all the arguments from the *cvs* buffer and will always behave as if called interactively. -- DOUBLE is the generic case." +- `DOUBLE' is the generic case." (declare (debug (&define sexp lambda-list stringp ("interactive" interactive) def-body)) (doc-string 3)) @@ -910,7 +910,7 @@ (setq rerun t))))) (defun cvs-get-cvsroot () - "Gets the CVSROOT for DIR." + "Get the CVSROOT for DIR." (let ((cvs-cvsroot-file (expand-file-name "Root" "CVS"))) (or (cvs-file-to-string cvs-cvsroot-file t) cvs-cvsroot @@ -940,7 +940,7 @@ ;;;###autoload (defun cvs-checkout (modules dir flags &optional root) - "Run a 'cvs checkout MODULES' in DIR. + "Run a `cvs checkout MODULES' in DIR. Feed the output to a *cvs* buffer, display it in the current window, and run `cvs-mode' on it. @@ -964,7 +964,7 @@ :noexist t))) (defun-cvs-mode (cvs-mode-checkout . NOARGS) (dir) - "Run cvs checkout against the current branch. + "Run `cvs checkout' against the current branch. The files are stored to DIR." (interactive (let* ((branch (cvs-prefix-get 'cvs-branch-prefix)) @@ -1082,7 +1082,7 @@ :noshow noshow :dont-change-disc t)) (defun cvs-update-filter (proc string) - "Filter function for pcl-cvs. + "Filter function for PCL-CVS. This function gets the output that CVS sends to stdout. It inserts the STRING into (process-buffer PROC) but it also checks if CVS is waiting for a lock file. If so, it inserts a message cookie in the *cvs* buffer." @@ -1229,7 +1229,7 @@ (defun-cvs-mode cvs-mode-mark (&optional arg) "Mark the fileinfo on the current line. If the fileinfo is a directory, all the contents of that directory are -marked instead. A directory can never be marked." +marked instead. A directory can never be marked." (interactive) (let* ((tin (ewoc-locate cvs-cookies)) (fi (ewoc-data tin))) @@ -1397,7 +1397,7 @@ (nreverse fis))) (cl-defun cvs-mode-marked (filter &optional cmd - &key read-only one file noquery) + &key read-only one file noquery) "Get the list of marked FIS. CMD is used to determine whether to use the marks or not. Only files for which FILTER is applicable are returned. @@ -1636,25 +1636,25 @@ (defun-cvs-mode (cvs-mode-diff-head . SIMPLE) (flags) "Diff the selected files against the head of the current branch. -See ``cvs-mode-diff'' for more info." +See `cvs-mode-diff' for more info." (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))) (cvs-mode-diff-1 (cons "-rHEAD" flags))) (defun-cvs-mode (cvs-mode-diff-repository . SIMPLE) (flags) "Diff the files for changes in the repository since last co/update/commit. -See ``cvs-mode-diff'' for more info." +See `cvs-mode-diff' for more info." (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))) (cvs-mode-diff-1 (cons "-rBASE" (cons "-rHEAD" flags)))) (defun-cvs-mode (cvs-mode-diff-yesterday . SIMPLE) (flags) "Diff the selected files against yesterday's head of the current branch. -See ``cvs-mode-diff'' for more info." +See `cvs-mode-diff' for more info." (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))) (cvs-mode-diff-1 (cons "-Dyesterday" flags))) (defun-cvs-mode (cvs-mode-diff-vendor . SIMPLE) (flags) "Diff the selected files against the head of the vendor branch. -See ``cvs-mode-diff'' for more info." +See `cvs-mode-diff' for more info." (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))) (cvs-mode-diff-1 (cons (concat "-r" cvs-vendor-branch) flags))) @@ -1904,7 +1904,7 @@ FILTER is passed to `cvs-applicable-p' to only apply the command to files for which it makes sense. SHOW indicates that CMD should be not be run in the default temp buffer and - should be shown to the user. The buffer and mode to be used is determined + should be shown to the user. The buffer and mode to be used are determined by `cvs-buffer-name-alist'. DONT-CHANGE-DISC non-nil indicates that the command will not change the contents of files. This is only used by the parser." @@ -1999,7 +1999,7 @@ (defun cvs-mode-view-file-other-window (e) - "View the file." + "View the file in another window." (interactive (list last-input-event)) (cvs-mode-find-file e t t)) @@ -2209,7 +2209,7 @@ ;; Byte compile files. (defun-cvs-mode cvs-mode-byte-compile-files () - "Run byte-compile-file on all selected files that end in '.el'." + "Run byte-compile-file on all selected files with '.el' extension." (interactive) (let ((marked (cvs-get-marked (cvs-ignore-marks-p "byte-compile")))) (dolist (fi marked) @@ -2318,7 +2318,7 @@ (defun cvs-change-cvsroot (newroot) - "Change the cvsroot." + "Change the CVSROOT." (interactive "DNew repository: ") (if (or (file-directory-p (expand-file-name "CVSROOT" newroot)) (y-or-n-p (concat "Warning: no CVSROOT found inside repository." @@ -2344,7 +2344,7 @@ (defcustom cvs-dired-use-hook '(4) "Whether or not opening a CVS directory should run PCL-CVS. A value of nil means never do it. -ALWAYS means to always do it unless a prefix argument is given to the +`always' means to always do it unless a prefix argument is given to the command that prompted the opening of the directory. Anything else means to do it only if the prefix arg is equal to this value." :group 'pcl-cvs ------------------------------------------------------------ revno: 116734 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2014-03-12 03:21:09 +0100 message: lisp/frameset.el (frameset--jump-to-register): Add autoload. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-11 17:10:07 +0000 +++ lisp/ChangeLog 2014-03-12 02:21:09 +0000 @@ -1,3 +1,8 @@ +2014-03-12 Juanma Barranquero + + * frameset.el (frameset--jump-to-register): Add autoload; it could be + called from jump-to-register after unloading the frameset package. + 2014-03-11 Stefan Monnier * simple.el (set-mark): Ensure mark-active is nil if the mark is nil === modified file 'lisp/frameset.el' --- lisp/frameset.el 2014-03-11 01:44:51 +0000 +++ lisp/frameset.el 2014-03-12 02:21:09 +0000 @@ -1236,6 +1236,7 @@ ;; Register support +;;;###autoload (defun frameset--jump-to-register (data) "Restore frameset from DATA stored in register. Called from `jump-to-register'. Internal use only." ------------------------------------------------------------ revno: 116733 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16975 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2014-03-11 13:10:07 -0400 message: * lisp/simple.el (set-mark): Ensure mark-active is nil if the mark is nil. Deactivate the mark before setting it to nil. (activate-mark): Do nothing if region is already active. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-03-11 01:44:51 +0000 +++ lisp/ChangeLog 2014-03-11 17:10:07 +0000 @@ -1,3 +1,9 @@ +2014-03-11 Stefan Monnier + + * simple.el (set-mark): Ensure mark-active is nil if the mark is nil + (bug#16975). Deactivate the mark before setting it to nil. + (activate-mark): Do nothing if region is already active. + 2014-03-11 Juanma Barranquero * frameset.el (frameset--target-display): Remove definition; declare. @@ -42,8 +48,8 @@ 2014-03-10 Leo Liu - * emacs-lisp/eldoc.el (eldoc-minibuffer-message): Clear - eldoc-last-message. (Bug#16920) + * emacs-lisp/eldoc.el (eldoc-minibuffer-message): + Clear eldoc-last-message. (Bug#16920) 2014-03-10 Stefan Monnier === modified file 'lisp/simple.el' --- lisp/simple.el 2014-03-06 04:11:08 +0000 +++ lisp/simple.el 2014-03-11 17:10:07 +0000 @@ -4392,12 +4392,12 @@ "Activate the mark. If NO-TMM is non-nil, leave `transient-mark-mode' alone." (when (mark t) - (unless (and mark-active transient-mark-mode) - (force-mode-line-update)) ;Refresh toolbar (bug#16382). - (setq mark-active t) - (unless (or transient-mark-mode no-tmm) - (setq transient-mark-mode 'lambda)) - (run-hooks 'activate-mark-hook))) + (unless (region-active-p) + (force-mode-line-update) ;Refresh toolbar (bug#16382). + (setq mark-active t) + (unless (or transient-mark-mode no-tmm) + (setq transient-mark-mode 'lambda)) + (run-hooks 'activate-mark-hook)))) (defun set-mark (pos) "Set this buffer's mark to POS. Don't use this function! @@ -4415,14 +4415,18 @@ store it in a Lisp variable. Example: (let ((beg (point))) (forward-line 1) (delete-region beg (point)))." - - (set-marker (mark-marker) pos (current-buffer)) (if pos - (activate-mark 'no-tmm) + (progn + (set-marker (mark-marker) pos (current-buffer)) + (activate-mark 'no-tmm)) ;; Normally we never clear mark-active except in Transient Mark mode. ;; But when we actually clear out the mark value too, we must ;; clear mark-active in any mode. - (deactivate-mark t))) + (deactivate-mark t) + ;; `deactivate-mark' sometimes leaves mark-active non-nil, but + ;; it should never be nil if the mark is nil. + (setq mark-active nil) + (set-marker (mark-marker) nil))) (defcustom use-empty-active-region nil "Whether \"region-aware\" commands should act on empty regions. ------------------------------------------------------------ revno: 116732 committer: martin rudalics branch nick: trunk timestamp: Tue 2014-03-11 08:20:49 +0100 message: Add comment for revisions 116716 and 116727. diff: === modified file 'src/w32term.c' --- src/w32term.c 2014-03-10 18:53:39 +0000 +++ src/w32term.c 2014-03-11 07:20:49 +0000 @@ -4684,6 +4684,10 @@ { bool iconified = FRAME_ICONIFIED_P (f); + /* The following was made unconditional in a + pathetic attempt to fix bug#16967 in revision + 116716 but, considered counterproductive was made + conditional again in revision 116727. martin */ if (iconified) SET_FRAME_VISIBLE (f, 1); SET_FRAME_ICONIFIED (f, 0);