Now on revision 106134. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106134 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-10-19 08:54:24 -0400 message: Fix minor mode docstrings for the new meaning of a nil ARG. * abbrev.el (abbrev-mode): * allout.el (allout-mode): * autoinsert.el (auto-insert-mode): * autoarg.el (autoarg-mode, autoarg-kp-mode): * autorevert.el (auto-revert-mode, auto-revert-tail-mode) (global-auto-revert-mode): * battery.el (display-battery-mode): * composite.el (global-auto-composition-mode) (auto-composition-mode): * delsel.el (delete-selection-mode): * desktop.el (desktop-save-mode): * dired-x.el (dired-omit-mode): * dirtrack.el (dirtrack-mode): * doc-view.el (doc-view-minor-mode): * double.el (double-mode): * electric.el (electric-indent-mode, electric-pair-mode): * emacs-lock.el (emacs-lock-mode): * epa-hook.el (auto-encryption-mode): * follow.el (follow-mode): * font-core.el (font-lock-mode): * frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode): * help.el (temp-buffer-resize-mode): * hilit-chg.el (highlight-changes-mode) (highlight-changes-visible-mode): * hi-lock.el (hi-lock-mode): * hl-line.el (hl-line-mode, global-hl-line-mode): * icomplete.el (icomplete-mode): * ido.el (ido-everywhere): * image-file.el (auto-image-file-mode): * image-mode.el (image-minor-mode): * iswitchb.el (iswitchb-mode): * jka-cmpr-hook.el (auto-compression-mode): * linum.el (linum-mode): * longlines.el (longlines-mode): * master.el (master-mode): * mb-depth.el (minibuffer-depth-indicate-mode): * menu-bar.el (menu-bar-mode): * minibuf-eldef.el (minibuffer-electric-default-mode): * mouse-sel.el (mouse-sel-mode): * msb.el (msb-mode): * mwheel.el (mouse-wheel-mode): * outline.el (outline-minor-mode): * paren.el (show-paren-mode): * recentf.el (recentf-mode): * reveal.el (reveal-mode, global-reveal-mode): * rfn-eshadow.el (file-name-shadow-mode): * ruler-mode.el (ruler-mode): * savehist.el (savehist-mode): * scroll-all.el (scroll-all-mode): * scroll-bar.el (scroll-bar-mode): * server.el (server-mode): * shell.el (shell-dirtrack-mode): * simple.el (auto-fill-mode, transient-mark-mode) (visual-line-mode, overwrite-mode, binary-overwrite-mode) (line-number-mode, column-number-mode, size-indication-mode) (auto-save-mode, normal-erase-is-backspace-mode, visible-mode): * strokes.el (strokes-mode): * time.el (display-time-mode): * t-mouse.el (gpm-mouse-mode): * tool-bar.el (tool-bar-mode): * tooltip.el (tooltip-mode): * type-break.el (type-break-mode-line-message-mode) (type-break-query-mode): * view.el (view-mode): * whitespace.el (whitespace-mode, whitespace-newline-mode) (global-whitespace-mode, global-whitespace-newline-mode): * xt-mouse.el (xterm-mouse-mode): Doc fix. * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix autogenerated docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 09:10:10 +0000 +++ lisp/ChangeLog 2011-10-19 12:54:24 +0000 @@ -1,3 +1,79 @@ +2011-10-19 Chong Yidong + + Doc fix for minor modes, stating that an omitted argument enables + the mode unconditionally when called from Lisp. + + * abbrev.el (abbrev-mode): + * allout.el (allout-mode): + * autoinsert.el (auto-insert-mode): + * autoarg.el (autoarg-mode, autoarg-kp-mode): + * autorevert.el (auto-revert-mode, auto-revert-tail-mode) + (global-auto-revert-mode): + * battery.el (display-battery-mode): + * composite.el (global-auto-composition-mode) + (auto-composition-mode): + * delsel.el (delete-selection-mode): + * desktop.el (desktop-save-mode): + * dired-x.el (dired-omit-mode): + * dirtrack.el (dirtrack-mode): + * doc-view.el (doc-view-minor-mode): + * double.el (double-mode): + * electric.el (electric-indent-mode, electric-pair-mode): + * emacs-lock.el (emacs-lock-mode): + * epa-hook.el (auto-encryption-mode): + * follow.el (follow-mode): + * font-core.el (font-lock-mode): + * frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode): + * help.el (temp-buffer-resize-mode): + * hilit-chg.el (highlight-changes-mode) + (highlight-changes-visible-mode): + * hi-lock.el (hi-lock-mode): + * hl-line.el (hl-line-mode, global-hl-line-mode): + * icomplete.el (icomplete-mode): + * ido.el (ido-everywhere): + * image-file.el (auto-image-file-mode): + * image-mode.el (image-minor-mode): + * iswitchb.el (iswitchb-mode): + * jka-cmpr-hook.el (auto-compression-mode): + * linum.el (linum-mode): + * longlines.el (longlines-mode): + * master.el (master-mode): + * mb-depth.el (minibuffer-depth-indicate-mode): + * menu-bar.el (menu-bar-mode): + * minibuf-eldef.el (minibuffer-electric-default-mode): + * mouse-sel.el (mouse-sel-mode): + * msb.el (msb-mode): + * mwheel.el (mouse-wheel-mode): + * outline.el (outline-minor-mode): + * paren.el (show-paren-mode): + * recentf.el (recentf-mode): + * reveal.el (reveal-mode, global-reveal-mode): + * rfn-eshadow.el (file-name-shadow-mode): + * ruler-mode.el (ruler-mode): + * savehist.el (savehist-mode): + * scroll-all.el (scroll-all-mode): + * scroll-bar.el (scroll-bar-mode): + * server.el (server-mode): + * shell.el (shell-dirtrack-mode): + * simple.el (auto-fill-mode, transient-mark-mode) + (visual-line-mode, overwrite-mode, binary-overwrite-mode) + (line-number-mode, column-number-mode, size-indication-mode) + (auto-save-mode, normal-erase-is-backspace-mode, visible-mode): + * strokes.el (strokes-mode): + * time.el (display-time-mode): + * t-mouse.el (gpm-mouse-mode): + * tool-bar.el (tool-bar-mode): + * tooltip.el (tooltip-mode): + * type-break.el (type-break-mode-line-message-mode) + (type-break-query-mode): + * view.el (view-mode): + * whitespace.el (whitespace-mode, whitespace-newline-mode) + (global-whitespace-mode, global-whitespace-newline-mode): + * xt-mouse.el (xterm-mouse-mode): Doc fix. + + * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix + autogenerated docstring. + 2011-10-19 Juri Linkov * net/browse-url.el (browse-url-can-use-xdg-open): Support LXDE === modified file 'lisp/abbrev.el' --- lisp/abbrev.el 2011-09-02 16:38:40 +0000 +++ lisp/abbrev.el 2011-10-19 12:54:24 +0000 @@ -54,9 +54,12 @@ (define-minor-mode abbrev-mode "Toggle Abbrev mode in the current buffer. -With optional argument ARG, turn abbrev mode on if ARG is -positive, otherwise turn it off. In Abbrev mode, inserting an -abbreviation causes it to expand and be replaced by its expansion." +With a prefix argument ARG, enable Abbrev mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Abbrev mode if ARG is omitted or nil. + +In Abbrev mode, inserting an abbreviation causes it to expand and +be replaced by its expansion." ;; It's defined in C, this stops the d-m-m macro defining it again. :variable abbrev-mode) === modified file 'lisp/allout-widgets.el' --- lisp/allout-widgets.el 2011-07-05 18:54:08 +0000 +++ lisp/allout-widgets.el 2011-10-19 12:54:24 +0000 @@ -486,13 +486,14 @@ ;;;_ > define-minor-mode allout-widgets-mode (arg) ;;;###autoload (define-minor-mode allout-widgets-mode - "Allout-mode extension, providing graphical decoration of outline structure. - -This is meant to operate along with allout-mode, via `allout-mode-hook'. - -If optional argument ARG is greater than 0, enable. -If optional argument ARG is less than 0, disable. -Anything else, toggle between active and inactive. + "Toggle Allout Widgets mode. +With a prefix argument ARG, enable Allout Widgets mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Allout Widgets mode is an extension of Allout mode that provides +graphical decoration of outline structure. It is meant to +operate along with `allout-mode', via `allout-mode-hook'. The graphics include: === modified file 'lisp/allout.el' --- lisp/allout.el 2011-09-24 20:58:23 +0000 +++ lisp/allout.el 2011-10-19 12:54:24 +0000 @@ -1702,17 +1702,19 @@ ;;;###autoload (define-minor-mode allout-mode ;;;_ . Doc string: - "Toggle minor mode for controlling exposure and editing of text outlines. + "Toggle Allout outline mode. +With a prefix argument ARG, enable Allout outline mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + \\ - -Allout outline mode always runs as a minor mode. - -Allout outline mode provides extensive outline oriented -formatting and manipulation. It enables structural editing of -outlines, as well as navigation and exposure. It also is -specifically aimed at accommodating syntax-sensitive text like -programming languages. \(For example, see the allout code itself, -which is organized as an allout outline.) +Allout outline mode is a minor mode that provides extensive +outline oriented formatting and manipulation. It enables +structural editing of outlines, as well as navigation and +exposure. It also is specifically aimed at accommodating +syntax-sensitive text like programming languages. \(For example, +see the allout code itself, which is organized as an allout +outline.) In addition to typical outline navigation and exposure, allout includes: === modified file 'lisp/autoarg.el' --- lisp/autoarg.el 2011-01-25 04:08:28 +0000 +++ lisp/autoarg.el 2011-10-19 12:54:24 +0000 @@ -90,15 +90,19 @@ ;;;###autoload (define-minor-mode autoarg-mode - "Toggle Autoarg minor mode globally. -With ARG, turn Autoarg mode on if ARG is positive, off otherwise. + "Toggle Autoarg mode, a global minor mode. +With a prefix argument ARG, enable Autoarg mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + \\ -In Autoarg mode digits are bound to `digit-argument' -- i.e. they -supply prefix arguments as C-DIGIT and M-DIGIT normally do -- and -C-DIGIT inserts DIGIT. \\[autoarg-terminate] terminates the prefix sequence -and inserts the digits of the autoarg sequence into the buffer. -Without a numeric prefix arg the normal binding of \\[autoarg-terminate] is -invoked, i.e. what it would be with Autoarg mode off. +In Autoarg mode, digits are bound to `digit-argument', i.e. they +supply prefix arguments as C-DIGIT and M-DIGIT normally do. +Furthermore, C-DIGIT inserts DIGIT. +\\[autoarg-terminate] terminates the prefix sequence and inserts +the digits of the autoarg sequence into the buffer. +Without a numeric prefix arg, the normal binding of \\[autoarg-terminate] +is invoked, i.e. what it would be with Autoarg mode off. For example: `6 9 \\[autoarg-terminate]' inserts `69' into the buffer, as does `C-6 C-9'. @@ -112,11 +116,14 @@ ;;;###autoload (define-minor-mode autoarg-kp-mode - "Toggle Autoarg-KP minor mode globally. -With ARG, turn Autoarg mode on if ARG is positive, off otherwise. + "Toggle Autoarg-KP mode, a global minor mode. +With a prefix argument ARG, enable Autoarg-KP mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + \\ -This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1' -etc. to supply digit arguments. +This is similar to `autoarg-mode' but rebinds the keypad keys +`kp-1' etc. to supply digit arguments. \\{autoarg-kp-mode-map}" nil " Aakp" autoarg-kp-mode-map :global t :group 'keyboard === modified file 'lisp/autoinsert.el' --- lisp/autoinsert.el 2011-09-02 16:38:40 +0000 +++ lisp/autoinsert.el 2011-10-19 12:54:24 +0000 @@ -397,9 +397,10 @@ ;;;###autoload (define-minor-mode auto-insert-mode - "Toggle Auto-insert mode. -With prefix ARG, turn Auto-insert mode on if and only if ARG is positive. -Returns the new status of Auto-insert mode (non-nil means on). + "Toggle Auto-insert mode, a global minor mode. +With a prefix argument ARG, enable Auto-insert mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. When Auto-insert mode is enabled, when new files are created you can insert a template for the file depending on the mode of the buffer." === modified file 'lisp/autorevert.el' --- lisp/autorevert.el 2011-04-13 14:27:41 +0000 +++ lisp/autorevert.el 2011-10-19 12:54:24 +0000 @@ -284,10 +284,15 @@ ;;;###autoload (define-minor-mode auto-revert-mode - "Toggle reverting buffer when file on disk changes. - -With arg, turn Auto Revert mode on if and only if arg is positive. -This is a minor mode that affects only the current buffer. + "Toggle reverting buffer when the file changes (Auto Revert mode). +With a prefix argument ARG, enable Auto Revert mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Auto Revert mode is a minor mode that affects only the current +buffer. When enabled, it reverts the buffer when the file on +disk changes. + Use `global-auto-revert-mode' to automatically revert all buffers. Use `auto-revert-tail-mode' if you know that the file will only grow without being changed in the part that is already in the buffer." @@ -314,14 +319,16 @@ ;;;###autoload (define-minor-mode auto-revert-tail-mode - "Toggle reverting tail of buffer when file on disk grows. -With arg, turn Tail mode on if arg is positive, otherwise turn it off. + "Toggle reverting tail of buffer when the file grows. +With a prefix argument ARG, enable Auto-Revert Tail mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -When Tail mode is enabled, the tail of the file is constantly -followed, as with the shell command `tail -f'. This means that -whenever the file grows on disk (presumably because some -background process is appending to it from time to time), this is -reflected in the current buffer. +When Auto Revert Tail mode is enabled, the tail of the file is +constantly followed, as with the shell command `tail -f'. This +means that whenever the file grows on disk (presumably because +some background process is appending to it from time to time), +this is reflected in the current buffer. You can edit the buffer and turn this mode off and on again as you please. But make sure the background process has stopped @@ -367,7 +374,7 @@ ;;;###autoload (defun turn-on-auto-revert-tail-mode () - "Turn on Auto-Revert Tail Mode. + "Turn on Auto-Revert Tail mode. This function is designed to be added to hooks, for example: (add-hook 'my-logfile-mode-hook 'turn-on-auto-revert-tail-mode)" @@ -377,12 +384,13 @@ ;;;###autoload (define-minor-mode global-auto-revert-mode "Toggle Global Auto Revert mode. -With optional prefix argument ARG, enable Global Auto Revert Mode -if ARG > 0, else disable it. +With a prefix argument ARG, enable Global Auto Revert mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -This is a global minor mode that reverts any buffer associated -with a file when the file changes on disk. Use `auto-revert-mode' -to revert a particular buffer. +Global Auto Revert mode is a global minor mode that reverts any +buffer associated with a file when the file changes on disk. Use +`auto-revert-mode' to revert a particular buffer. If `global-auto-revert-non-file-buffers' is non-nil, this mode may also revert some non-file buffers, as described in the === modified file 'lisp/battery.el' --- lisp/battery.el 2011-08-25 19:49:57 +0000 +++ lisp/battery.el 2011-10-19 12:54:24 +0000 @@ -164,10 +164,14 @@ ;;;###autoload (define-minor-mode display-battery-mode - "Display battery status information in the mode line. -The text being displayed in the mode line is controlled by the variables + "Toggle battery status display in mode line (Display Battery mode). +With a prefix argument ARG, enable Display Battery mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +The text displayed in the mode line is controlled by `battery-mode-line-format' and `battery-status-function'. -The mode line will be updated automatically every `battery-update-interval' +The mode line is be updated every `battery-update-interval' seconds." :global t :group 'battery (setq battery-mode-line-string "") === modified file 'lisp/composite.el' --- lisp/composite.el 2011-04-19 13:44:55 +0000 +++ lisp/composite.el 2011-10-19 12:54:24 +0000 @@ -728,12 +728,13 @@ ;;;###autoload (define-minor-mode auto-composition-mode "Toggle Auto Composition mode. -With ARG, turn Auto Composition mode off if and only if ARG is a non-positive -number; if ARG is nil, toggle Auto Composition mode; anything else turns Auto -Composition on. +With a prefix argument ARG, enable Auto Composition mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -When Auto Composition is enabled, text characters are automatically composed -by functions registered in `composition-function-table' (which see). +When Auto Composition mode is enabled, text characters are +automatically composed by functions registered in +`composition-function-table'. You can use `global-auto-composition-mode' to turn on Auto Composition mode in all buffers (this is the default)." @@ -744,10 +745,13 @@ ;;;###autoload (define-minor-mode global-auto-composition-mode - "Toggle Auto-Composition mode in every possible buffer. -With prefix arg, turn Global-Auto-Composition mode on if and only if arg -is positive. -See `auto-composition-mode' for more information on Auto-Composition mode." + "Toggle Auto Composition mode in all buffers. +With a prefix argument ARG, enable it if ARG is positive, and +disable it otherwise. If called from Lisp, enable it if ARG is +omitted or nil. + +For more information on Auto Composition mode, see +`auto-composition-mode' ." :variable (default-value 'auto-composition-mode)) (defalias 'toggle-auto-composition 'auto-composition-mode) === modified file 'lisp/delsel.el' --- lisp/delsel.el 2011-01-25 04:08:28 +0000 +++ lisp/delsel.el 2011-10-19 12:54:24 +0000 @@ -56,8 +56,9 @@ ;;;###autoload (define-minor-mode delete-selection-mode "Toggle Delete Selection mode. -With prefix ARG, turn Delete Selection mode on if ARG is -positive, off if ARG is not positive. +With a prefix argument ARG, enable Delete Selection mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. When Delete Selection mode is enabled, Transient Mark mode is also enabled and typed text replaces the selection if the selection is === modified file 'lisp/desktop.el' --- lisp/desktop.el 2011-04-19 13:44:55 +0000 +++ lisp/desktop.el 2011-10-19 12:54:24 +0000 @@ -147,11 +147,14 @@ ;;;###autoload (define-minor-mode desktop-save-mode - "Toggle desktop saving mode. -With numeric ARG, turn desktop saving on if ARG is positive, off -otherwise. If desktop saving is turned on, the state of Emacs is -saved from one session to another. See variable `desktop-save' -and function `desktop-read' for details." + "Toggle desktop saving (Desktop Save mode). +With a prefix argument ARG, enable Desktop Save mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +If Desktop Save mode is enabled, the state of Emacs is saved from +one session to another. See variable `desktop-save' and function +`desktop-read' for details." :global t :group 'desktop) === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2011-07-12 07:26:48 +0000 +++ lisp/dired-x.el 2011-10-19 12:54:24 +0000 @@ -133,16 +133,20 @@ :group 'dired-x) (define-minor-mode dired-omit-mode - "Toggle Dired-Omit mode. -With numeric ARG, enable Dired-Omit mode if ARG is positive, disable -otherwise. Enabling and disabling is buffer-local. -If enabled, \"uninteresting\" files are not listed. -Uninteresting files are those whose filenames match regexp `dired-omit-files', -plus those ending with extensions in `dired-omit-extensions'. - -To enable omitting in every Dired buffer, you can put in your ~/.emacs - - (add-hook 'dired-mode-hook (lambda () (dired-omit-mode 1))) + "Toggle omission of uninteresting files in Dired (Dired-Omit mode). +With a prefix argument ARG, enable Dired-Omit mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Dired-Omit mode is a buffer-local minor mode. When enabled in a +Dired buffer, Dired does not list files whose filenames match +regexp `dired-omit-files', nor files ending with extensions in +`dired-omit-extensions'. + +To enable omitting in every Dired buffer, you can put this in +your init file: + + (add-hook 'dired-mode-hook (lambda () (dired-omit-mode))) See Info node `(dired-x) Omitting Variables' for more information." :group 'dired-x === modified file 'lisp/dired.el' --- lisp/dired.el 2011-09-18 20:43:20 +0000 +++ lisp/dired.el 2011-10-19 12:54:24 +0000 @@ -4128,7 +4128,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) -;;;;;; "dired-x" "dired-x.el" "219648338c42c7912fa336680b434db0") +;;;;;; "dired-x" "dired-x.el" "0a19e4cb2cadf007be715af1035c9c36") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ === modified file 'lisp/dirtrack.el' --- lisp/dirtrack.el 2011-10-17 19:48:28 +0000 +++ lisp/dirtrack.el 2011-10-19 12:54:24 +0000 @@ -183,7 +183,11 @@ ;;;###autoload (define-minor-mode dirtrack-mode - "Enable or disable Dirtrack directory tracking in a shell buffer. + "Toggle directory tracking in shell buffers (Dirtrack mode). +With a prefix argument ARG, enable Dirtrack mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + This method requires that your shell prompt contain the full current working directory at all times, and that `dirtrack-list' is set to match the prompt. This is an alternative to @@ -199,7 +203,7 @@ (define-minor-mode dirtrack-debug-mode - "Enable or disable Dirtrack debugging." + "Toggle Dirtrack debugging." nil nil nil (if dirtrack-debug-mode (display-buffer (get-buffer-create dirtrack-debug-buffer)))) === modified file 'lisp/doc-view.el' --- lisp/doc-view.el 2011-07-16 19:38:25 +0000 +++ lisp/doc-view.el 2011-10-19 12:54:24 +0000 @@ -1502,8 +1502,11 @@ ;;;###autoload (define-minor-mode doc-view-minor-mode - "Toggle Doc view minor mode. -With arg, turn Doc view minor mode on if arg is positive, off otherwise. + "Toggle displaying buffer via Doc View (Doc View minor mode). +With a prefix argument ARG, enable Doc View minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + See the command `doc-view-mode' for more information on this mode." nil " DocView" doc-view-minor-mode-map :group 'doc-view === modified file 'lisp/double.el' --- lisp/double.el 2011-01-25 04:08:28 +0000 +++ lisp/double.el 2011-10-19 12:54:24 +0000 @@ -146,12 +146,13 @@ ;;;###autoload (define-minor-mode double-mode - "Toggle Double mode. -With prefix argument ARG, turn Double mode on if ARG is positive, otherwise -turn it off. + "Toggle special insertion on double keypresses (Double mode). +With a prefix argument ARG, enable Double mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Double mode is on, some keys will insert different strings -when pressed twice. See variable `double-map' for details." +When Double mode is enabled, some keys will insert different +strings when pressed twice. See `double-map' for details." :lighter " Double" :link '(emacs-commentary-link "double") (kill-local-variable 'key-translation-map) === modified file 'lisp/electric.el' --- lisp/electric.el 2011-04-19 13:44:55 +0000 +++ lisp/electric.el 2011-10-19 12:54:24 +0000 @@ -241,8 +241,14 @@ ;;;###autoload (define-minor-mode electric-indent-mode - "Automatically reindent lines of code when inserting particular chars. -`electric-indent-chars' specifies the set of chars that should cause reindentation." + "Toggle on-the-fly reindentation (Electric Indent mode). +With a prefix argument ARG, enable Electric Indent mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Electric Indent mode is a global minor mode. When enabled, +reindentation is triggered whenever you insert a character listed +in `electric-indent-chars'." :global t :group 'electricity (if electric-indent-mode @@ -330,7 +336,14 @@ ;;;###autoload (define-minor-mode electric-pair-mode - "Automatically pair-up parens when inserting an open paren." + "Toggle automatic parens pairing (Electric Pair mode). +With a prefix argument ARG, enable Electric Pair mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Electric Pair mode is a global minor mode. When enabled, typing +an open parenthesis automatically inserts the corresponding +closing parenthesis. \(Likewise for brackets, etc.)" :global t :group 'electricity (if electric-pair-mode === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2011-01-25 04:08:28 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2011-10-19 12:54:24 +0000 @@ -350,14 +350,16 @@ (define-minor-mode ,global-mode ;; Very short lines to avoid too long lines in the generated ;; doc string. - ,(format "Toggle %s in every possible buffer. -With prefix ARG, turn %s on if and only if -ARG is positive. + ,(format "Toggle %s in all buffers. +With prefix ARG, enable %s if ARG is positive; +otherwise, disable it. If called from Lisp, enable the mode if +ARG is omitted or nil. + %s is enabled in all buffers where \`%s' would do it. See `%s' for more information on %s." - pretty-name pretty-global-name pretty-name turn-on - mode pretty-name) + pretty-name pretty-global-name + pretty-name turn-on mode pretty-name) :global t ,@group ,@(nreverse extra-keywords) ;; Setup hook to handle future mode changes and new buffers. === modified file 'lisp/emacs-lock.el' --- lisp/emacs-lock.el 2011-07-05 15:09:19 +0000 +++ lisp/emacs-lock.el 2011-10-19 12:54:24 +0000 @@ -176,14 +176,16 @@ ;;;###autoload (define-minor-mode emacs-lock-mode - "Toggle Emacs Lock mode in the current buffer. - -With \\[universal-argument], ask for the locking mode to be used. -With other prefix ARG, turn mode on if ARG is positive, off otherwise. - -Initially, if the user does not pass an explicit locking mode, it defaults -to `emacs-lock-default-locking-mode' (which see); afterwards, the locking -mode most recently set on the buffer is used instead. + "Toggle Emacs Lock mode in the current buffer. +If called with a plain prefix argument, ask for the locking mode +to be used. With any other prefix ARG, turn mode on if ARG is +positive, off otherwise. If called from Lisp, enable the mode if +ARG is omitted or nil. + +Initially, if the user does not pass an explicit locking mode, it +defaults to `emacs-lock-default-locking-mode' (which see); +afterwards, the locking mode most recently set on the buffer is +used instead. When called from Elisp code, ARG can be any locking mode: === modified file 'lisp/epa-hook.el' --- lisp/epa-hook.el 2011-04-04 06:16:23 +0000 +++ lisp/epa-hook.el 2011-10-19 12:54:24 +0000 @@ -49,7 +49,7 @@ :group 'epa-file) (defvar epa-file-encrypt-to nil - "*Recipient(s) used for encrypting files. + "Recipient(s) used for encrypting files. May either be a string or a list of strings.") (put 'epa-file-encrypt-to 'safe-local-variable @@ -83,9 +83,10 @@ (auto-save-mode 0))) (define-minor-mode auto-encryption-mode - "Toggle automatic file encryption and decryption. -With prefix argument ARG, turn auto encryption on if positive, else off. -Return the new status of auto encryption (non-nil means on)." + "Toggle automatic file encryption/decryption (Auto Encryption mode). +With a prefix argument ARG, enable Auto Encryption mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :init-value t :group 'epa-file :version "23.1" ;; We'd like to use custom-initialize-set here so the setup is done ;; before dumping, but at the point where the defcustom is evaluated, === modified file 'lisp/face-remap.el' --- lisp/face-remap.el 2011-01-25 04:08:28 +0000 +++ lisp/face-remap.el 2011-10-19 12:54:24 +0000 @@ -204,7 +204,7 @@ (make-variable-buffer-local 'text-scale-mode-amount) (define-minor-mode text-scale-mode - "Minor mode for displaying buffer text in a larger/smaller font than usual. + "Minor mode for displaying buffer text in a larger/smaller font. The amount of scaling is determined by the variable `text-scale-mode-amount': one step scales the global default === modified file 'lisp/follow.el' --- lisp/follow.el 2011-07-14 01:09:00 +0000 +++ lisp/follow.el 2011-10-19 12:54:24 +0000 @@ -484,10 +484,13 @@ (put 'follow-mode 'permanent-local t) ;;;###autoload (define-minor-mode follow-mode - "Minor mode that combines windows into one tall virtual window. + "Toggle Follow mode. +With a prefix argument ARG, enable Follow mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -The feeling of a \"virtual window\" has been accomplished by the use -of two major techniques: +Follow mode is a minor mode that combines windows into one tall +virtual window. This is accomplished by two main techniques: * The windows always displays adjacent sections of the buffer. This means that whenever one window is moved, all the === modified file 'lisp/font-core.el' --- lisp/font-core.el 2011-01-26 08:36:39 +0000 +++ lisp/font-core.el 2011-10-19 12:54:24 +0000 @@ -86,12 +86,12 @@ ;; The mode for which font-lock was initialized, or nil if none. (defvar font-lock-major-mode) + (define-minor-mode font-lock-mode - "Toggle Font Lock mode. -With arg, turn Font Lock mode off if and only if arg is a non-positive -number; if arg is nil, toggle Font Lock mode; anything else turns Font -Lock on. -\(Font Lock is also known as \"syntax highlighting\".) + "Toggle syntax highlighting in this buffer (Font Lock mode). +With a prefix argument ARG, enable Font Lock mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. When Font Lock mode is enabled, text is fontified as you type it: === modified file 'lisp/frame.el' --- lisp/frame.el 2011-09-11 21:47:39 +0000 +++ lisp/frame.el 2011-10-19 12:54:24 +0000 @@ -1134,7 +1134,10 @@ (define-minor-mode auto-raise-mode "Toggle whether or not the selected frame should auto-raise. -With ARG, turn auto-raise mode on if and only if ARG is positive. +With a prefix argument ARG, enable Auto Raise mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + Note that this controls Emacs's own auto-raise feature. Some window managers allow you to enable auto-raise for certain windows. You can use that for Emacs windows if you wish, but if you do, @@ -1145,7 +1148,10 @@ (define-minor-mode auto-lower-mode "Toggle whether or not the selected frame should auto-lower. -With ARG, turn auto-lower mode on if and only if ARG is positive. +With a prefix argument ARG, enable Auto Lower mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + Note that this controls Emacs's own auto-lower feature. Some window managers allow you to enable auto-lower for certain windows. You can use that for Emacs windows if you wish, but if you do, @@ -1556,14 +1562,13 @@ (setq blink-cursor-timer nil))) (define-minor-mode blink-cursor-mode - "Toggle blinking cursor mode. -With a numeric argument, turn blinking cursor mode on if ARG is positive, -otherwise turn it off. When blinking cursor mode is enabled, the -cursor of the selected window blinks. + "Toggle cursor blinking (Blink Cursor mode). +With a prefix argument ARG, enable Blink Cursor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -Note that this command is effective only when Emacs -displays through a window system, because then Emacs does its own -cursor display. On a text-only terminal, this is not implemented." +This command is effective only on graphical frames. On text-only +terminals, cursor blinking is controlled by the terminal." :init-value (not (or noninteractive no-blinking-cursor (eq system-type 'ms-dos) === modified file 'lisp/help.el' --- lisp/help.el 2011-09-29 08:16:15 +0000 +++ lisp/help.el 2011-10-19 12:54:24 +0000 @@ -977,13 +977,15 @@ :version "20.4") (define-minor-mode temp-buffer-resize-mode - "Toggle mode which makes windows smaller for temporary buffers. -With prefix argument ARG, turn the resizing of windows displaying -temporary buffers on if ARG is positive or off otherwise. + "Toggle auto-shrinking temp buffer windows (Temp Buffer Resize mode). +With a prefix argument ARG, enable Temp Buffer Resize mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. -This mode makes a window the right height for its contents, but -never more than `temp-buffer-max-height' nor less than -`window-min-height'. +When Temp Buffer Resize mode is enabled, the windows in which we +show a temporary buffer are automatically reduced in height to +fit the buffer's contents, but never more than +`temp-buffer-max-height' nor less than `window-min-height'. This mode is used by `help', `apropos' and `completion' buffers, and some others." === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2011-08-09 22:13:11 +0000 +++ lisp/hi-lock.el 2011-10-19 12:54:24 +0000 @@ -283,14 +283,17 @@ ;;;###autoload (define-minor-mode hi-lock-mode - "Toggle minor mode for interactively adding font-lock highlighting patterns. + "Toggle selective highlighting of patterns (Hi Lock mode). +With a prefix argument ARG, enable Hi Lock mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -If ARG positive, turn hi-lock on. Issuing a hi-lock command will also -turn hi-lock on. To turn hi-lock on in all buffers use -`global-hi-lock-mode' or in your .emacs file (global-hi-lock-mode 1). -When hi-lock is turned on, a \"Regexp Highlighting\" submenu is added -to the \"Edit\" menu. The commands in the submenu, which can be -called interactively, are: +Issuing one the highlighting commands listed below will +automatically enable Hi Lock mode. To enable Hi Lock mode in all +buffers, use `global-hi-lock-mode' or add (global-hi-lock-mode 1) +to your init file. When Hi Lock mode is enabled, a \"Regexp +Highlighting\" submenu is added to the \"Edit\" menu. The +commands in the submenu, which can be called interactively, are: \\[highlight-regexp] REGEXP FACE Highlight matches of pattern REGEXP in current buffer with FACE. === modified file 'lisp/hilit-chg.el' --- lisp/hilit-chg.el 2011-05-23 17:57:17 +0000 +++ lisp/hilit-chg.el 2011-10-19 12:54:24 +0000 @@ -326,14 +326,15 @@ ;;;###autoload (define-minor-mode highlight-changes-mode - "Toggle Highlight Changes mode. - -With ARG, turn Highlight Changes mode on if and only if arg is positive. - -In Highlight Changes mode changes are recorded with a text property. -Normally they are displayed in a distinctive face, but command -\\[highlight-changes-visible-mode] can be used to toggles this -on and off. + "Toggle highlighting changes in this buffer (Highlight Changes mode). +With a prefix argument ARG, enable Highlight Changes mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +When Highlight Changes is enabled, changes are marked with a text +property. Normally they are displayed in a distinctive face, but +command \\[highlight-changes-visible-mode] can be used to toggles +this on and off. Other functions for buffers in this mode include: \\[highlight-changes-next-change] - move point to beginning of next change @@ -366,14 +367,17 @@ ;;;###autoload (define-minor-mode highlight-changes-visible-mode - "Toggle visiblility of changes when buffer is in Highlight Changes mode. + "Toggle visiblility of highlighting due to Highlight Changes mode. +With a prefix argument ARG, enable Highlight Changes Visible mode +if ARG is positive, and disable it otherwise. If called from +Lisp, enable the mode if ARG is omitted or nil. -This mode only has an effect when Highlight Changes mode is on. -It allows toggling between whether or not the changed text is displayed +Highlight Changes Visible mode only has an effect when Highlight +Changes mode is on. When enabled, the changed text is displayed in a distinctive face. The default value can be customized with variable -`highlight-changes-visibility-initial-state' +`highlight-changes-visibility-initial-state'. This command does not itself set highlight-changes mode." === modified file 'lisp/hl-line.el' --- lisp/hl-line.el 2011-06-26 20:25:53 +0000 +++ lisp/hl-line.el 2011-10-19 12:54:24 +0000 @@ -124,10 +124,13 @@ ;;;###autoload (define-minor-mode hl-line-mode - "Buffer-local minor mode to highlight the line about point. -With ARG, turn Hl-Line mode on if ARG is positive, off otherwise. + "Toggle highlighting of the current line (Hl-Line mode). +With a prefix argument ARG, enable Hl-Line mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -If `hl-line-sticky-flag' is non-nil, Hl-Line mode highlights the +Hl-Line mode is a buffer-local minor mode. If +`hl-line-sticky-flag' is non-nil, Hl-Line mode highlights the line about the buffer's point in all windows. Caveat: the buffer's point might be different from the point of a non-selected window. Hl-Line mode uses the function @@ -171,8 +174,10 @@ ;;;###autoload (define-minor-mode global-hl-line-mode - "Global minor mode to highlight the line about point in the current window. -With ARG, turn Global-Hl-Line mode on if ARG is positive, off otherwise. + "Toggle line highlighting in all buffers (Global Hl-Line mode). +With a prefix argument ARG, enable Global Hl-Line mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. If `global-hl-line-sticky-flag' is non-nil, Global Hl-Line mode highlights the line about the current buffer's point in all === modified file 'lisp/ibuf-ext.el' --- lisp/ibuf-ext.el 2011-08-14 18:08:20 +0000 +++ lisp/ibuf-ext.el 2011-10-19 12:54:24 +0000 @@ -217,8 +217,10 @@ ;;;###autoload (define-minor-mode ibuffer-auto-mode - "Toggle use of Ibuffer's auto-update facility. -With numeric ARG, enable auto-update if and only if ARG is positive." + "Toggle use of Ibuffer's auto-update facility (Ibuffer Auto mode). +With a prefix argument ARG, enable Ibuffer Auto mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." nil nil nil (unless (derived-mode-p 'ibuffer-mode) (error "This buffer is not in Ibuffer mode")) === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2011-08-24 18:09:18 +0000 +++ lisp/ibuffer.el 2011-10-19 12:54:24 +0000 @@ -2648,12 +2648,14 @@ ;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group ;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group ;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode -;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "617b36fc8479547d679cf0103f82e3ff") +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "25e69a1e030791b3a3e7d91d4377173a") ;;; Generated autoloads from ibuf-ext.el (autoload 'ibuffer-auto-mode "ibuf-ext" "\ -Toggle use of Ibuffer's auto-update facility. -With numeric ARG, enable auto-update if and only if ARG is positive. +Toggle use of Ibuffer's auto-update facility (Ibuffer Auto mode). +With a prefix argument ARG, enable Ibuffer Auto mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. \(fn &optional ARG)" t nil) === modified file 'lisp/icomplete.el' --- lisp/icomplete.el 2011-09-18 16:13:01 +0000 +++ lisp/icomplete.el 2011-10-19 12:54:24 +0000 @@ -172,9 +172,10 @@ ;;;_ > icomplete-mode (&optional prefix) ;;;###autoload (define-minor-mode icomplete-mode - "Toggle incremental minibuffer completion for this Emacs session. -With a numeric argument, turn Icomplete mode on if ARG is positive, -otherwise turn it off." + "Toggle incremental minibuffer completion (Icomplete mode). +With a prefix argument ARG, enable Icomplete mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :group 'icomplete (if icomplete-mode ;; The following is not really necessary after first time - === modified file 'lisp/ido.el' --- lisp/ido.el 2011-10-17 13:27:53 +0000 +++ lisp/ido.el 2011-10-19 12:54:24 +0000 @@ -1469,8 +1469,10 @@ (add-hook 'choose-completion-string-functions 'ido-choose-completion-string)) (define-minor-mode ido-everywhere - "Toggle using ido-mode everywhere file and directory names are read. -With ARG, turn ido-mode on if arg is positive, off otherwise." + "Toggle use of Ido for all buffer/file reading. +With a prefix argument ARG, enable this feature if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :group 'ido (when (get 'ido-everywhere 'file) === modified file 'lisp/image-file.el' --- lisp/image-file.el 2011-01-25 04:08:28 +0000 +++ lisp/image-file.el 2011-10-19 12:54:24 +0000 @@ -178,11 +178,12 @@ ;;;###autoload (define-minor-mode auto-image-file-mode - "Toggle visiting of image files as images. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled. + "Toggle visiting of image files as images (Auto Image File mode). +With a prefix argument ARG, enable Auto Image File mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -Image files are those whose name has an extension in +An image file is one whose name has an extension in `image-file-name-extensions', or matches a regexp in `image-file-name-regexps'." :global t === modified file 'lisp/image-mode.el' --- lisp/image-mode.el 2011-09-19 19:27:30 +0000 +++ lisp/image-mode.el 2011-10-19 12:54:24 +0000 @@ -396,11 +396,14 @@ ;;;###autoload (define-minor-mode image-minor-mode - "Toggle Image minor mode. -With arg, turn Image minor mode on if arg is positive, off otherwise. -It provides the key \\\\[image-toggle-display] \ -to switch back to `image-mode' -to display an image file as the actual image." + "Toggle Image minor mode in this buffer. +With a prefix argument ARG, enable Image minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Image minor mode provides the key \\\\[image-toggle-display], +to switch back to `image-mode' and display an image file as the +actual image." nil (:eval (if image-type (format " Image[%s]" image-type) " Image")) image-minor-mode-map :group 'image === modified file 'lisp/iswitchb.el' --- lisp/iswitchb.el 2011-08-30 22:43:43 +0000 +++ lisp/iswitchb.el 2011-10-19 12:54:24 +0000 @@ -1424,10 +1424,13 @@ ;;;###autoload (define-minor-mode iswitchb-mode - "Toggle Iswitchb global minor mode. -With arg, turn Iswitchb mode on if ARG is positive, otherwise turn it off. -This mode enables switching between buffers using substrings. See -`iswitchb' for details." + "Toggle Iswitchb mode. +With a prefix argument ARG, enable Iswitchb mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +Iswitchb mode is a global minor mode that enables switching +between buffers using substrings. See `iswitchb' for details." nil nil iswitchb-global-map :global t :group 'iswitchb (if iswitchb-mode (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup) === modified file 'lisp/jka-cmpr-hook.el' --- lisp/jka-cmpr-hook.el 2011-07-15 17:18:53 +0000 +++ lisp/jka-cmpr-hook.el 2011-10-19 12:54:24 +0000 @@ -333,9 +333,14 @@ :group 'jka-compr) (define-minor-mode auto-compression-mode - "Toggle automatic file compression and uncompression. -With prefix argument ARG, turn auto compression on if positive, else off. -Return the new status of auto compression (non-nil means on)." + "Toggle Auto Compression mode. +With a prefix argument ARG, enable Auto Compression mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +Auto Compression mode is a global minor mode. When enabled, +compressed files are automatically uncompressed for reading, and +compressed when writing." :global t :init-value t :group 'jka-compr :version "22.1" (let* ((installed (jka-compr-installed-p)) (flag auto-compression-mode)) === modified file 'lisp/linum.el' --- lisp/linum.el 2011-04-04 09:35:16 +0000 +++ lisp/linum.el 2011-10-19 12:54:24 +0000 @@ -73,7 +73,12 @@ ;;;###autoload (define-minor-mode linum-mode - "Toggle display of line numbers in the left margin." + "Toggle display of line numbers in the left margin (Linum mode). +With a prefix argument ARG, enable Linum mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. + +Linum mode is a buffer-local minor mode." :lighter "" ; for desktop.el (if linum-mode (progn === modified file 'lisp/longlines.el' --- lisp/longlines.el 2011-08-07 14:14:54 +0000 +++ lisp/longlines.el 2011-10-19 12:54:24 +0000 @@ -95,21 +95,22 @@ ;;;###autoload (define-minor-mode longlines-mode - "Minor mode to wrap long lines. -In Long Lines mode, long lines are wrapped if they extend beyond -`fill-column'. The soft newlines used for line wrapping will not -show up when the text is yanked or saved to disk. - -With no argument, this command toggles Long Lines mode. -With a prefix argument ARG, turn Long Lines minor mode on if ARG is positive, -otherwise turn it off. - -If the variable `longlines-auto-wrap' is non-nil, lines are automatically -wrapped whenever the buffer is changed. You can always call -`fill-paragraph' to fill individual paragraphs. - -If the variable `longlines-show-hard-newlines' is non-nil, hard newlines -are indicated with a symbol." + "Toggle Long Lines mode in this buffer. +With a prefix argument ARG, enable Long Lines mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Long Lines mode is enabled, long lines are wrapped if they +extend beyond `fill-column'. The soft newlines used for line +wrapping will not show up when the text is yanked or saved to +disk. + +If the variable `longlines-auto-wrap' is non-nil, lines are +automatically wrapped whenever the buffer is changed. You can +always call `fill-paragraph' to fill individual paragraphs. + +If the variable `longlines-show-hard-newlines' is non-nil, hard +newlines are indicated with a symbol." :group 'longlines :lighter " ll" (if longlines-mode ;; Turn on longlines mode === modified file 'lisp/master.el' --- lisp/master.el 2011-01-26 08:36:39 +0000 +++ lisp/master.el 2011-10-19 12:54:24 +0000 @@ -72,12 +72,12 @@ ;;;###autoload (define-minor-mode master-mode "Toggle Master mode. -With no argument, this command toggles the mode. -Non-null prefix argument turns on the mode. -Null prefix argument turns off the mode. +With a prefix argument ARG, enable Master mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Master mode is enabled, you can scroll the slave buffer using the -following commands: +When Master mode is enabled, you can scroll the slave buffer +using the following commands: \\{master-mode-map} === modified file 'lisp/mb-depth.el' --- lisp/mb-depth.el 2011-01-25 04:08:28 +0000 +++ lisp/mb-depth.el 2011-10-19 12:54:24 +0000 @@ -56,12 +56,14 @@ ;;;###autoload (define-minor-mode minibuffer-depth-indicate-mode "Toggle Minibuffer Depth Indication mode. -When active, any recursive use of the minibuffer will show -the recursion depth in the minibuffer prompt. This is only -useful if `enable-recursive-minibuffers' is non-nil. +With a prefix argument ARG, enable Minibuffer Depth Indication +mode if ARG is positive, and disable it otherwise. If called +from Lisp, enable the mode if ARG is omitted or nil. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled." +Minibuffer Depth Indication mode is a global minor mode. When +enabled, any recursive use of the minibuffer will show the +recursion depth in the minibuffer prompt. This is only useful if +`enable-recursive-minibuffers' is non-nil." :global t :group 'minibuffer (if minibuffer-depth-indicate-mode === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2011-10-17 12:52:31 +0000 +++ lisp/menu-bar.el 2011-10-19 12:54:24 +0000 @@ -2169,11 +2169,13 @@ :help ,(purecopy "Put previous minibuffer history element in the minibuffer")))) (define-minor-mode menu-bar-mode - "Toggle display of a menu bar on each frame. + "Toggle display of a menu bar on each frame (Menu Bar mode). +With a prefix argument ARG, enable Menu Bar mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Menu Bar mode if ARG is omitted or nil. + This command applies to all frames that exist and frames to be -created in the future. -With a numeric argument, if the argument is positive, -turn on menu bars; otherwise, turn off menu bars." +created in the future." :init-value t :global t ;; It's defined in C/cus-start, this stops the d-m-m macro defining it again. === modified file 'lisp/minibuf-eldef.el' --- lisp/minibuf-eldef.el 2011-01-25 04:08:28 +0000 +++ lisp/minibuf-eldef.el 2011-10-19 12:54:24 +0000 @@ -131,14 +131,16 @@ ;;;###autoload (define-minor-mode minibuffer-electric-default-mode "Toggle Minibuffer Electric Default mode. -When active, minibuffer prompts that show a default value only show the -default when it's applicable -- that is, when hitting RET would yield -the default value. If the user modifies the input such that hitting RET -would enter a non-default value, the prompt is modified to remove the -default indication. +With a prefix argument ARG, enable Minibuffer Electric Default +mode if ARG is positive, and disable it otherwise. If called +from Lisp, enable the mode if ARG is omitted or nil. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled." +Minibuffer Electric Default mode is a global minor mode. When +enabled, minibuffer prompts that show a default value only show +the default when it's applicable -- that is, when hitting RET +would yield the default value. If the user modifies the input +such that hitting RET would enter a non-default value, the prompt +is modified to remove the default indication." :global t :group 'minibuffer (if minibuffer-electric-default-mode === modified file 'lisp/mouse-sel.el' --- lisp/mouse-sel.el 2011-07-12 21:59:09 +0000 +++ lisp/mouse-sel.el 2011-10-19 12:54:24 +0000 @@ -199,11 +199,12 @@ ;;;###autoload (define-minor-mode mouse-sel-mode "Toggle Mouse Sel mode. -With prefix ARG, turn Mouse Sel mode on if and only if ARG is positive. -Returns the new status of Mouse Sel mode (non-nil means on). +With a prefix argument ARG, enable Mouse Sel mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Mouse Sel mode is enabled, mouse selection is enhanced in -various ways: +Mouse Sel mode is a global minor mode. When enabled, mouse +selection is enhanced in various ways: - Double-clicking on symbol constituents selects symbols. Double-clicking on quotes or parentheses selects sexps. === modified file 'lisp/msb.el' --- lisp/msb.el 2011-05-23 17:57:17 +0000 +++ lisp/msb.el 2011-10-19 12:54:24 +0000 @@ -1133,7 +1133,10 @@ ;;;###autoload (define-minor-mode msb-mode "Toggle Msb mode. -With arg, turn Msb mode on if and only if arg is positive. +With a prefix argument ARG, enable Msb mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil. + This mode overrides the binding(s) of `mouse-buffer-menu' to provide a different buffer menu using the function `msb'." :global t :group 'msb === modified file 'lisp/mwheel.el' --- lisp/mwheel.el 2011-01-25 04:08:28 +0000 +++ lisp/mwheel.el 2011-10-19 12:54:24 +0000 @@ -250,11 +250,11 @@ (defvar mwheel-installed-bindings nil) -;; preloaded ;;;###autoload (define-minor-mode mouse-wheel-mode - "Toggle mouse wheel support. -With prefix argument ARG, turn on if positive, otherwise off. -Return non-nil if the new state is enabled." + "Toggle mouse wheel support (Mouse Wheel mode). +With a prefix argument ARG, enable Mouse Wheel mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :init-value t ;; We'd like to use custom-initialize-set here so the setup is done ;; before dumping, but at the point where the defcustom is evaluated, === modified file 'lisp/outline.el' --- lisp/outline.el 2011-09-18 20:43:20 +0000 +++ lisp/outline.el 2011-10-19 12:54:24 +0000 @@ -356,7 +356,10 @@ ;;;###autoload (define-minor-mode outline-minor-mode "Toggle Outline minor mode. -With arg, turn Outline minor mode on if arg is positive, off otherwise. +With a prefix argument ARG, enable Outline minor mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + See the command `outline-mode' for more information on this mode." nil " Outl" (list (cons [menu-bar] outline-minor-mode-menu-bar-map) (cons outline-minor-mode-prefix outline-mode-prefix-map)) === modified file 'lisp/paren.el' --- lisp/paren.el 2011-09-10 11:28:19 +0000 +++ lisp/paren.el 2011-10-19 12:54:24 +0000 @@ -102,12 +102,14 @@ ;;;###autoload (define-minor-mode show-paren-mode - "Toggle Show Paren mode. -With prefix ARG, turn Show Paren mode on if and only if ARG is positive. -Returns the new status of Show Paren mode (non-nil means on). + "Toggle visualization of matching parens (Show Paren mode). +With a prefix argument ARG, enable Show Paren mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -When Show Paren mode is enabled, any matching parenthesis is highlighted -in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time." +Show Paren mode is a global minor mode. When enabled, any +matching parenthesis is highlighted in `show-paren-style' after +`show-paren-delay' seconds of Emacs idle time." :global t :group 'paren-showing ;; Enable or disable the mechanism. ;; First get rid of the old idle timer. === modified file 'lisp/recentf.el' --- lisp/recentf.el 2011-04-19 13:44:55 +0000 +++ lisp/recentf.el 2011-10-19 12:54:24 +0000 @@ -1336,12 +1336,14 @@ ;;;###autoload (define-minor-mode recentf-mode - "Toggle recentf mode. -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled. + "Toggle \"Open Recent\" menu (Recentf mode). +With a prefix argument ARG, enable Recentf mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Recentf mode if ARG is omitted or nil. -When recentf mode is enabled, it maintains a menu for visiting files -that were operated on recently." +When Recentf mode is enabled, a \"Open Recent\" submenu is +displayed in the \"File\" menu, containing a list of files that +were operated on recently." :global t :group 'recentf :keymap recentf-mode-map === modified file 'lisp/reveal.el' --- lisp/reveal.el 2011-03-11 20:04:22 +0000 +++ lisp/reveal.el 2011-10-19 12:54:24 +0000 @@ -189,12 +189,13 @@ ;;;###autoload (define-minor-mode reveal-mode - "Toggle Reveal mode on or off. -Reveal mode renders invisible text around point visible again. + "Toggle decloaking of invisible text near point (Reveal mode). +With a prefix argument ARG, enable Reveal mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Reveal mode if ARG is omitted or nil. -Interactively, with no prefix argument, toggle the mode. -With universal prefix ARG (or if ARG is nil) turn mode on. -With zero or negative ARG turn mode off." +Reveral mode is a buffer-local minor mode. When enabled, it +reveals invisible text around point." :group 'reveal :lighter (global-reveal-mode nil " Reveal") :keymap reveal-mode-map @@ -207,12 +208,12 @@ ;;;###autoload (define-minor-mode global-reveal-mode - "Toggle Reveal mode in all buffers on or off. + "Toggle Reveal mode in all buffers (Global Reveal mode). Reveal mode renders invisible text around point visible again. -Interactively, with no prefix argument, toggle the mode. -With universal prefix ARG (or if ARG is nil) turn mode on. -With zero or negative ARG turn mode off." +With a prefix argument ARG, enable Global Reveal mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil." :global t :group 'reveal (setq-default reveal-mode global-reveal-mode) (if global-reveal-mode === modified file 'lisp/rfn-eshadow.el' --- lisp/rfn-eshadow.el 2011-01-25 04:08:28 +0000 +++ lisp/rfn-eshadow.el 2011-10-19 12:54:24 +0000 @@ -207,15 +207,17 @@ (error nil))) (define-minor-mode file-name-shadow-mode - "Toggle File-Name Shadow mode. -When active, any part of a filename being read in the minibuffer -that would be ignored (because the result is passed through + "Toggle file-name shadowing in minibuffers (File-Name Shadow mode). +With a prefix argument ARG, enable File-Name Shadow mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +File-Name Shadow mode is a global minor mode. When enabled, any +part of a filename being read in the minibuffer that would be +ignored (because the result is passed through `substitute-in-file-name') is given the properties in -`file-name-shadow-properties', which can be used to make -that portion dim, invisible, or otherwise less visually noticeable. - -With prefix argument ARG, turn on if positive, otherwise off. -Returns non-nil if the new state is enabled." +`file-name-shadow-properties', which can be used to make that +portion dim, invisible, or otherwise less visually noticeable." :global t ;; We'd like to use custom-initialize-set here so the setup is done ;; before dumping, but at the point where the defcustom is evaluated, === modified file 'lisp/ruler-mode.el' --- lisp/ruler-mode.el 2011-01-25 04:08:28 +0000 +++ lisp/ruler-mode.el 2011-10-19 12:54:24 +0000 @@ -567,8 +567,10 @@ ;;;###autoload (define-minor-mode ruler-mode - "Toggle Ruler mode. -In Ruler mode, Emacs displays a ruler in the header line." + "Toggle display of ruler in header line (Ruler mode). +With a prefix argument ARG, enable Ruler mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable the mode +if ARG is omitted or nil." nil nil ruler-mode-map :group 'ruler-mode === modified file 'lisp/savehist.el' --- lisp/savehist.el 2011-04-19 13:44:55 +0000 +++ lisp/savehist.el 2011-10-19 12:54:24 +0000 @@ -170,15 +170,19 @@ ;;;###autoload (define-minor-mode savehist-mode - "Toggle savehist-mode. -Positive ARG turns on `savehist-mode'. When on, savehist-mode causes -minibuffer history to be saved periodically and when exiting Emacs. -When turned on for the first time in an Emacs session, it causes the -previous minibuffer history to be loaded from `savehist-file'. + "Toggle saving of minibuffer history (Savehist mode). +With a prefix argument ARG, enable Savehist mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Savehist mode is enabled, minibuffer history is saved +periodically and when exiting Emacs. When Savehist mode is +enabled for the first time in an Emacs session, it loads the +previous minibuffer history from `savehist-file'. This mode should normally be turned on from your Emacs init file. -Calling it at any other time replaces your current minibuffer histories, -which is probably undesirable." +Calling it at any other time replaces your current minibuffer +histories, which is probably undesirable." :global t (if (not savehist-mode) (savehist-uninstall) === modified file 'lisp/scroll-all.el' --- lisp/scroll-all.el 2011-01-25 04:08:28 +0000 +++ lisp/scroll-all.el 2011-10-19 12:54:24 +0000 @@ -101,10 +101,13 @@ ;;;###autoload (define-minor-mode scroll-all-mode - "Toggle Scroll-All minor mode. -With ARG, turn Scroll-All minor mode on if ARG is positive, off otherwise. -When Scroll-All mode is on, scrolling commands entered in one window -apply to all visible windows in the same frame." + "Toggle shared scrolling in same-frame windows (Scroll-All mode). +With a prefix argument ARG, enable Scroll-All mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Scroll-All mode is enabled, scrolling commands invoked in +one window apply to all visible windows in the same frame." nil " *SL*" nil :global t :group 'windows === modified file 'lisp/scroll-bar.el' --- lisp/scroll-bar.el 2011-07-14 17:11:49 +0000 +++ lisp/scroll-bar.el 2011-10-19 12:54:24 +0000 @@ -114,12 +114,15 @@ (defun get-scroll-bar-mode () scroll-bar-mode) (defsetf get-scroll-bar-mode set-scroll-bar-mode) + (define-minor-mode scroll-bar-mode - "Toggle display of vertical scroll bars on all frames. + "Toggle vertical scroll bars on all frames (Scroll Bar mode). +With a prefix argument ARG, enable Scroll Bar mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + This command applies to all frames that exist and frames to be -created in the future. -With a numeric argument, if the argument is positive -turn on scroll bars; otherwise turn off scroll bars." +created in the future." :variable (eq (get-scroll-bar-mode) (or previous-scroll-bar-mode default-frame-scroll-bars))) === modified file 'lisp/server.el' --- lisp/server.el 2011-08-28 18:46:38 +0000 +++ lisp/server.el 2011-10-19 12:54:24 +0000 @@ -669,9 +669,13 @@ ;;;###autoload (define-minor-mode server-mode "Toggle Server mode. -With ARG, turn Server mode on if ARG is positive, off otherwise. +With a prefix argument ARG, enable Server mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Server mode if ARG is omitted or nil. + Server mode runs a process that accepts commands from the -`emacsclient' program. See `server-start' and Info node `Emacs server'." +`emacsclient' program. See Info node `Emacs server' and +`server-start' for details." :global t :group 'server :version "22.1" === modified file 'lisp/shell.el' --- lisp/shell.el 2011-10-01 22:05:36 +0000 +++ lisp/shell.el 2011-10-19 12:54:24 +0000 @@ -890,9 +890,13 @@ (defvaralias 'shell-dirtrack-mode 'shell-dirtrackp) (define-minor-mode shell-dirtrack-mode - "Turn directory tracking on and off in a shell buffer. -The `dirtrack' package provides an alternative implementation of this -feature - see the function `dirtrack-mode'." + "Toggle directory tracking in this shell buffer (Shell Dirtrack mode). +With a prefix argument ARG, enable Shell Dirtrack mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +The `dirtrack' package provides an alternative implementation of +this feature; see the function `dirtrack-mode'." nil nil nil (setq list-buffers-directory (if shell-dirtrack-mode default-directory)) (if shell-dirtrack-mode === modified file 'lisp/simple.el' --- lisp/simple.el 2011-10-13 11:58:54 +0000 +++ lisp/simple.el 2011-10-19 12:54:24 +0000 @@ -4086,13 +4086,15 @@ (define-minor-mode transient-mark-mode "Toggle Transient Mark mode. -With ARG, turn Transient Mark mode on if ARG is positive, off otherwise. +With a prefix argument ARG, enable Transient Mark mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Transient Mark mode if ARG is omitted or nil. -In Transient Mark mode, when the mark is active, the region is highlighted. -Changing the buffer \"deactivates\" the mark. -So do certain other operations that set the mark -but whose main purpose is something else--for example, -incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]. +Transient Mark mode is a global minor mode. When enabled, the +region is highlighted whenever the mark is active. The mark is +\"deactivated\" by changing the buffer, and after certain other +operations that set the mark but whose main purpose is something +else--for example, incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]. You can also deactivate the mark by typing \\[keyboard-quit] or \\[keyboard-escape-quit]. @@ -4906,8 +4908,15 @@ (defvar visual-line--saved-state nil) (define-minor-mode visual-line-mode - "Redefine simple editing commands to act on visual lines, not logical lines. -This also turns on `word-wrap' in the buffer." + "Toggle visual line based editing (Visual Line mode). +With a prefix argument ARG, enable Visual Line mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Visual Line mode is enabled, `word-wrap' is turned on in +this buffer, and simple editing commands are redefined to act on +visual lines, not logical lines. See Info node `Visual Line +Mode' for details." :keymap visual-line-mode-map :group 'visual-line :lighter " Wrap" @@ -5301,10 +5310,14 @@ (put 'auto-fill-function 'safe-local-variable 'null) (define-minor-mode auto-fill-mode - "Toggle Auto Fill mode. -With ARG, turn Auto Fill mode on if and only if ARG is positive. -In Auto Fill mode, inserting a space at a column beyond `current-fill-column' -automatically breaks the line at a previous space. + "Toggle automatic line breaking (Auto Fill mode). +With a prefix argument ARG, enable Auto Fill mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Auto Fill mode is enabled, inserting a space at a column +beyond `current-fill-column' automatically breaks the line at a +previous space. When `auto-fill-mode' is on, the `auto-fill-function' variable is non-`nil'. @@ -5412,36 +5425,44 @@ "The string displayed in the mode line when in binary overwrite mode.") (define-minor-mode overwrite-mode - "Toggle overwrite mode. -With prefix argument ARG, turn overwrite mode on if ARG is positive, -otherwise turn it off. In overwrite mode, printing characters typed -in replace existing text on a one-for-one basis, rather than pushing -it to the right. At the end of a line, such characters extend the line. -Before a tab, such characters insert until the tab is filled in. -\\[quoted-insert] still inserts characters in overwrite mode; this -is supposed to make it easier to insert characters when necessary." + "Toggle Overwrite mode. +With a prefix argument ARG, enable Overwrite mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +When Overwrite mode is enabled, printing characters typed in +replace existing text on a one-for-one basis, rather than pushing +it to the right. At the end of a line, such characters extend +the line. Before a tab, such characters insert until the tab is +filled in. \\[quoted-insert] still inserts characters in +overwrite mode; this is supposed to make it easier to insert +characters when necessary." :variable (eq overwrite-mode 'overwrite-mode-textual)) (define-minor-mode binary-overwrite-mode - "Toggle binary overwrite mode. -With prefix argument ARG, turn binary overwrite mode on if ARG is -positive, otherwise turn it off. In binary overwrite mode, printing -characters typed in replace existing text. Newlines are not treated -specially, so typing at the end of a line joins the line to the next, -with the typed character between them. Typing before a tab character -simply replaces the tab with the character typed. \\[quoted-insert] -replaces the text at the cursor, just as ordinary typing characters do. - -Note that binary overwrite mode is not its own minor mode; it is a -specialization of overwrite mode, entered by setting the + "Toggle Binary Overwrite mode. +With a prefix argument ARG, enable Binary Overwrite mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. + +When Binary Overwrite mode is enabled, printing characters typed +in replace existing text. Newlines are not treated specially, so +typing at the end of a line joins the line to the next, with the +typed character between them. Typing before a tab character +simply replaces the tab with the character typed. +\\[quoted-insert] replaces the text at the cursor, just as +ordinary typing characters do. + +Note that Binary Overwrite mode is not its own minor mode; it is +a specialization of overwrite mode, entered by setting the `overwrite-mode' variable to `overwrite-mode-binary'." :variable (eq overwrite-mode 'overwrite-mode-binary)) (define-minor-mode line-number-mode - "Toggle Line Number mode. -With ARG, turn Line Number mode on if ARG is positive, otherwise -turn it off. When Line Number mode is enabled, the line number -appears in the mode line. + "Toggle line number display in the mode line (Line Number mode). +With a prefix argument ARG, enable Line Number mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. Line numbers do not appear for very large buffers and buffers with very long lines; see variables `line-number-display-limit' @@ -5449,22 +5470,27 @@ :init-value t :global t :group 'mode-line) (define-minor-mode column-number-mode - "Toggle Column Number mode. -With ARG, turn Column Number mode on if ARG is positive, -otherwise turn it off. When Column Number mode is enabled, the -column number appears in the mode line." + "Toggle column number display in the mode line (Column Number mode). +With a prefix argument ARG, enable Column Number mode if ARG is +positive, and disable it otherwise. + +If called from Lisp, enable the mode if ARG is omitted or nil." :global t :group 'mode-line) (define-minor-mode size-indication-mode - "Toggle Size Indication mode. -With ARG, turn Size Indication mode on if ARG is positive, -otherwise turn it off. When Size Indication mode is enabled, the -size of the accessible part of the buffer appears in the mode line." + "Toggle buffer size display in the mode line (Size Indication mode). +With a prefix argument ARG, enable Size Indication mode if ARG is +positive, and disable it otherwise. + +If called from Lisp, enable the mode if ARG is omitted or nil." :global t :group 'mode-line) (define-minor-mode auto-save-mode - "Toggle auto-saving of contents of current buffer. -With prefix argument ARG, turn auto-saving on if positive, else off." + "Toggle auto-saving in the current buffer (Auto Save mode). +With a prefix argument ARG, enable Auto Save mode if ARG is +positive, and disable it otherwise. + +If called from Lisp, enable the mode if ARG is omitted or nil." :variable ((and buffer-auto-save-file-name ;; If auto-save is off because buffer has shrunk, ;; then toggling should turn it on. @@ -6634,8 +6660,9 @@ (define-minor-mode normal-erase-is-backspace-mode "Toggle the Erase and Delete mode of the Backspace and Delete keys. - -With numeric ARG, turn the mode on if and only if ARG is positive. +With a prefix argument ARG, enable this feature if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. On window systems, when this mode is on, Delete is mapped to C-d and Backspace is mapped to DEL; when this mode is off, both @@ -6709,13 +6736,13 @@ "Saved value of `buffer-invisibility-spec' when Visible mode is on.") (define-minor-mode visible-mode - "Toggle Visible mode. -With argument ARG turn Visible mode on if ARG is positive, otherwise -turn it off. + "Toggle making all invisible text temporarily visible (Visible mode). +With a prefix argument ARG, enable Visible mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. -Enabling Visible mode makes all invisible text temporarily visible. -Disabling Visible mode turns off that effect. Visible mode works by -saving the value of `buffer-invisibility-spec' and setting it to nil." +This mode works by saving the value of `buffer-invisibility-spec' +and setting it to nil." :lighter " Vis" :group 'editing-basics (when (local-variable-p 'vis-mode-saved-buffer-invisibility-spec) === modified file 'lisp/strokes.el' --- lisp/strokes.el 2011-04-19 13:44:55 +0000 +++ lisp/strokes.el 2011-10-19 12:54:24 +0000 @@ -1386,8 +1386,12 @@ ;;;###autoload (define-minor-mode strokes-mode - "Toggle Strokes global minor mode.\\ -With ARG, turn strokes on if and only if ARG is positive. + "Toggle Strokes mode, a global minor mode. +With a prefix argument ARG, enable Strokes mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. + +\\ Strokes are pictographic mouse gestures which invoke commands. Strokes are invoked with \\[strokes-do-stroke]. You can define new strokes with \\[strokes-global-set-stroke]. See also === modified file 'lisp/t-mouse.el' --- lisp/t-mouse.el 2011-01-26 08:36:39 +0000 +++ lisp/t-mouse.el 2011-10-19 12:54:24 +0000 @@ -33,7 +33,7 @@ ;; mev. Now the interface with gpm is directly through a Unix socket, so this ;; file is reduced to a single minor mode macro call. -;; +;; ;;; Code: @@ -65,9 +65,10 @@ (define-obsolete-function-alias 't-mouse-mode 'gpm-mouse-mode "23.1") ;;;###autoload (define-minor-mode gpm-mouse-mode - "Toggle gpm-mouse mode to use the mouse in GNU/Linux consoles. -With prefix arg, turn gpm-mouse mode on if arg is positive, -otherwise turn it off. + "Toggle mouse support in GNU/Linux consoles (GPM Mouse mode). +With a prefix argument ARG, enable GPM Mouse mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. This allows the use of the mouse when operating on a GNU/Linux console, in the same way as you can use the mouse under X11. === modified file 'lisp/time.el' --- lisp/time.el 2011-08-08 15:53:35 +0000 +++ lisp/time.el 2011-10-19 12:54:24 +0000 @@ -484,14 +484,15 @@ ;;;###autoload (define-minor-mode display-time-mode "Toggle display of time, load level, and mail flag in mode lines. -With a numeric arg, enable this display if arg is positive. +With a prefix argument ARG, enable Display Time mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +it if ARG is omitted or nil. -When this display is enabled, it updates automatically every minute -\(you can control the number of seconds between updates by -customizing `display-time-interval'). -If `display-time-day-and-date' is non-nil, the current day and date -are displayed as well. -This runs the normal hook `display-time-hook' after each update." +When Display Time mode is enabled, it updates every minute (you +can control the number of seconds between updates by customizing +`display-time-interval'). If `display-time-day-and-date' is +non-nil, the current day and date are displayed as well. This +runs the normal hook `display-time-hook' after each update." :global t :group 'display-time (and display-time-timer (cancel-timer display-time-timer)) (setq display-time-timer nil) === modified file 'lisp/tool-bar.el' --- lisp/tool-bar.el 2011-07-10 14:09:05 +0000 +++ lisp/tool-bar.el 2011-10-19 12:54:24 +0000 @@ -43,9 +43,10 @@ ;; Deleting it means invoking this command won't work ;; when you are on a tty. I hope that won't cause too much trouble -- rms. (define-minor-mode tool-bar-mode - "Toggle use of the tool bar. -With a numeric argument, if the argument is positive, turn on the -tool bar; otherwise, turn off the tool bar. + "Toggle the tool bar in all graphical frames (Tool Bar mode). +With a prefix argument ARG, enable Tool Bar mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +Tool Bar mode if ARG is omitted or nil. See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for conveniently adding tool bar items." === modified file 'lisp/tooltip.el' --- lisp/tooltip.el 2011-04-19 13:44:55 +0000 +++ lisp/tooltip.el 2011-10-19 12:54:24 +0000 @@ -39,11 +39,14 @@ ;;; Switching tooltips on/off (define-minor-mode tooltip-mode - "Toggle Tooltip mode. -With ARG, turn Tooltip mode on if and only if ARG is positive. -When this minor mode is enabled, Emacs displays help text -in a pop-up window for buttons and menu items that you put the mouse on. -\(However, if `tooltip-use-echo-area' is non-nil, this and + "Toggle use of graphical tooltips (Tooltip mode). +With a prefix argument ARG, enable Tooltip mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +it if ARG is omitted or nil. + +When Tooltip mode is enabled, Emacs displays help text in a +pop-up window for buttons and menu items that you put the mouse +on. \(However, if `tooltip-use-echo-area' is non-nil, this and all pop-up help appears in the echo area.) When Tooltip mode is disabled, Emacs displays one line of === modified file 'lisp/type-break.el' --- lisp/type-break.el 2011-07-04 01:06:33 +0000 +++ lisp/type-break.el 2011-10-19 12:54:24 +0000 @@ -431,13 +431,13 @@ type-break-mode) (define-minor-mode type-break-mode-line-message-mode - "Enable or disable warnings in the mode line about typing breaks. - -A negative PREFIX argument disables this mode. -No argument or any non-negative argument enables it. - -The user may also enable or disable this mode simply by setting the -variable of the same name. + "Toggle warnings about typing breaks in the mode line. +With a prefix argument ARG, enable these warnings if ARG is +positive, and disable them otherwise. If called from Lisp, +enable them if ARG is omitted or nil. + +The user may also enable or disable this mode simply by setting +the variable of the same name. Variables controlling the display of messages in the mode line include: @@ -448,17 +448,13 @@ :global t) (define-minor-mode type-break-query-mode - "Enable or disable warnings in the mode line about typing breaks. - -When enabled, the user is periodically queried about whether to take a -typing break at that moment. The function which does this query is -specified by the variable `type-break-query-function'. - -A negative PREFIX argument disables this mode. -No argument or any non-negative argument enables it. - -The user may also enable or disable this mode simply by setting the -variable of the same name." + "Toggle typing break queries. +With a prefix argument ARG, enable these queries if ARG is +positive, and disable them otherwise. If called from Lisp, +enable them if ARG is omitted or nil. + +The user may also enable or disable this mode simply by setting +the variable of the same name." :global t) === modified file 'lisp/view.el' --- lisp/view.el 2011-09-02 16:38:40 +0000 +++ lisp/view.el 2011-10-19 12:54:24 +0000 @@ -369,19 +369,24 @@ ;; bindings instead of using the \\[] construction. The reason for this ;; is that most commands have more than one key binding. "Toggle View mode, a minor mode for viewing text but not editing it. -With prefix argument ARG, turn View mode on if ARG is positive, otherwise -turn it off. - -Emacs commands that do not change the buffer contents are available as usual. -Kill commands insert text in kill buffers but do not delete. Other commands -\(among them most letters and punctuation) beep and tell that the buffer is -read-only. +With a prefix argument ARG, enable View mode if ARG is positive, +and disable it otherwise. If called from Lisp, enable View mode +if ARG is omitted or nil. + +When View mode is enabled, commands that do not change the buffer +contents are available as usual. Kill commands insert text in +kill buffers but do not delete. Most other commands beep and +tell the user that the buffer is read-only. + \\ -The following additional commands are provided. Most commands take prefix -arguments. Page commands default to \"page size\" lines which is almost a whole -window full, or number of lines set by \\[View-scroll-page-forward-set-page-size] or \\[View-scroll-page-backward-set-page-size]. Half page commands default to -and set \"half page size\" lines which initially is half a window full. Search -commands default to a repeat count of one. + +The following additional commands are provided. Most commands +take prefix arguments. Page commands default to \"page size\" +lines which is almost a whole window, or number of lines set by +\\[View-scroll-page-forward-set-page-size] or \\[View-scroll-page-backward-set-page-size]. +Half page commands default to and set \"half page size\" lines +which initially is half a window full. Search commands default +to a repeat count of one. H, h, ? This message. Digits provide prefix arguments. === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2011-09-19 18:06:14 +0000 +++ lisp/whitespace.el 2011-10-19 12:54:24 +0000 @@ -1064,11 +1064,10 @@ ;;;###autoload (define-minor-mode whitespace-mode - "Toggle whitespace minor mode visualization (\"ws\" on modeline). - -If ARG is null, toggle whitespace visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle whitespace visualization (Whitespace mode). +With a prefix argument ARG, enable Whitespace mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. See also `whitespace-style', `whitespace-newline' and `whitespace-display-mappings'." @@ -1088,11 +1087,10 @@ ;;;###autoload (define-minor-mode whitespace-newline-mode - "Toggle NEWLINE minor mode visualization (\"nl\" on modeline). - -If ARG is null, toggle NEWLINE visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle newline visualization (Whitespace Newline mode). +With a prefix argument ARG, enable Whitespace Newline mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable the mode if ARG is omitted or nil. Use `whitespace-newline-mode' only for NEWLINE visualization exclusively. For other visualizations, including NEWLINE @@ -1116,11 +1114,10 @@ ;;;###autoload (define-minor-mode global-whitespace-mode - "Toggle whitespace global minor mode visualization (\"WS\" on modeline). - -If ARG is null, toggle whitespace visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle whitespace visualization globally (Global Whitespace mode). +With a prefix argument ARG, enable Global Whitespace mode if ARG +is positive, and disable it otherwise. If called from Lisp, +enable it if ARG is omitted or nil. See also `whitespace-style', `whitespace-newline' and `whitespace-display-mappings'." @@ -1174,11 +1171,10 @@ ;;;###autoload (define-minor-mode global-whitespace-newline-mode - "Toggle NEWLINE global minor mode visualization (\"NL\" on modeline). - -If ARG is null, toggle NEWLINE visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. + "Toggle global newline visualization (Global Whitespace Newline mode). +With a prefix argument ARG, enable Global Whitespace Newline mode +if ARG is positive, and disable it otherwise. If called from +Lisp, enable it if ARG is omitted or nil. Use `global-whitespace-newline-mode' only for NEWLINE visualization exclusively. For other visualizations, including === modified file 'lisp/wid-browse.el' --- lisp/wid-browse.el 2011-04-19 13:44:55 +0000 +++ lisp/wid-browse.el 2011-10-19 12:54:24 +0000 @@ -270,8 +270,7 @@ ;;;###autoload (define-minor-mode widget-minor-mode - "Togle minor mode for traversing widgets. -With arg, turn widget mode on if and only if arg is positive." + "Minor mode for traversing widgets." :lighter " Widget") ;;; The End: === modified file 'lisp/xt-mouse.el' --- lisp/xt-mouse.el 2011-08-09 22:13:11 +0000 +++ lisp/xt-mouse.el 2011-10-19 12:54:24 +0000 @@ -199,8 +199,9 @@ ;;;###autoload (define-minor-mode xterm-mouse-mode "Toggle XTerm mouse mode. -With prefix arg, turn XTerm mouse mode on if arg is positive, otherwise turn -it off. +With a prefix argument ARG, enable XTerm mouse mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil. Turn it on to use Emacs mouse commands, and off to use xterm mouse commands. This works in terminal emulators compatible with xterm. It only ------------------------------------------------------------ revno: 106133 fixes bug(s): http://debbugs.gnu.org/9771 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-10-19 13:46:17 +0200 message: Followup to revision 106131. src/xdisp.c (try_window_reusing_current_matrix): If a line ends in a display vector or the next line starts in a display vector, continue redrawing the window even though the character position of start_row was reached. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-19 09:48:35 +0000 +++ src/ChangeLog 2011-10-19 11:46:17 +0000 @@ -2,6 +2,10 @@ * xdisp.c (start_display): If the character at POS is displayed via a display vector, reset IT->current.dpvec_index to zero. + (try_window_reusing_current_matrix): If a line ends in a display + vector or the next line starts in a display vector, continue + redrawing the window even though the character position of + start_row was reached. (Bug#9771, part 2) 2011-10-18 Chong Yidong === modified file 'src/xdisp.c' --- src/xdisp.c 2011-10-19 09:48:35 +0000 +++ src/xdisp.c 2011-10-19 11:46:17 +0000 @@ -16078,13 +16078,20 @@ start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix); } - /* If we have reached alignment, - we can copy the rest of the rows. */ - if (IT_CHARPOS (it) == CHARPOS (start)) + /* If we have reached alignment, we can copy the rest of the + rows. */ + if (IT_CHARPOS (it) == CHARPOS (start) + /* Don't accept "alignment" inside a display vector, + since start_row could have started in the middle of + that same display vector (thus their character + positions match), and we have no way of telling if + that is the case. */ + && it.current.dpvec_index < 0) break; if (display_line (&it)) last_text_row = it.glyph_row - 1; + } /* A value of current_y < last_visible_y means that we stopped ------------------------------------------------------------ revno: 106132 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-10-19 06:18:49 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-10-13 10:18:32 +0000 +++ autogen/configure 2011-10-19 10:18:49 +0000 @@ -11140,8 +11140,8 @@ if test "$pkg_check_gtk" != "yes"; then HAVE_GTK=no if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.6 - GTK_REQUIRED=2.6 + GLIB_REQUIRED=2.10 + GTK_REQUIRED=2.10 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" ------------------------------------------------------------ revno: 106131 fixes bug(s): http://debbugs.gnu.org/9771 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-10-19 11:48:35 +0200 message: Fix part 2 of bug #9771 with lines that start with a display vector. src/xdisp.c (start_display): If the character at POS is displayed via a display vector, reset IT->current.dpvec_index to zero. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-18 21:07:56 +0000 +++ src/ChangeLog 2011-10-19 09:48:35 +0000 @@ -1,3 +1,9 @@ +2011-10-19 Eli Zaretskii + + * xdisp.c (start_display): If the character at POS is displayed + via a display vector, reset IT->current.dpvec_index to zero. + (Bug#9771, part 2) + 2011-10-18 Chong Yidong * xdisp.c (get_next_display_element): Handle U+2010 and U+2011 === modified file 'src/xdisp.c' --- src/xdisp.c 2011-10-18 21:07:56 +0000 +++ src/xdisp.c 2011-10-19 09:48:35 +0000 @@ -2851,6 +2851,13 @@ it->continuation_lines_width += it->current_x; } + /* If the character at POS is displayed via a display + vector, move_it_to above stops at the final glyph of + IT->dpvec. To make the caller redisplay that character + again (a.k.a. start at POS), we need to reset the + dpvec_index to the beginning of IT->dpvec. */ + else if (it->current.dpvec_index >= 0) + it->current.dpvec_index = 0; /* We're starting a new display line, not affected by the height of the continued line, so clear the appropriate ------------------------------------------------------------ revno: 106130 fixes bug(s): http://debbugs.gnu.org/9779 committer: Juri Linkov branch nick: trunk timestamp: Wed 2011-10-19 12:10:10 +0300 message: * lisp/net/browse-url.el (browse-url-can-use-xdg-open): Support LXDE by checking environment variables "DESKTOP_SESSION" and "XDG_CURRENT_DESKTOP". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-19 09:03:39 +0000 +++ lisp/ChangeLog 2011-10-19 09:10:10 +0000 @@ -1,5 +1,11 @@ 2011-10-19 Juri Linkov + * net/browse-url.el (browse-url-can-use-xdg-open): Support LXDE + by checking environment variables "DESKTOP_SESSION" and + "XDG_CURRENT_DESKTOP". (Bug#9779) + +2011-10-19 Juri Linkov + * net/browse-url.el (browse-url-browser-function): Add "Chromium". (browse-url-chromium-program, browse-url-chromium-arguments): New defcustoms. === modified file 'lisp/net/browse-url.el' --- lisp/net/browse-url.el 2011-10-19 09:03:39 +0000 +++ lisp/net/browse-url.el 2011-10-19 09:10:10 +0000 @@ -48,6 +48,7 @@ ;; browse-url-generic arbitrary ;; browse-url-default-windows-browser MS-Windows browser ;; browse-url-default-macosx-browser Mac OS X browser +;; browse-url-xdg-open Free Desktop xdg-open on Gnome, KDE, Xfce4, LXDE ;; browse-url-gnome-moz GNOME interface to Mozilla ;; browse-url-kde KDE konqueror (kfm) ;; browse-url-elinks Elinks Don't know (tried with 0.12.GIT) @@ -943,12 +944,13 @@ url args)) (defun browse-url-can-use-xdg-open () - "Check if xdg-open can be used, i.e. we are on Gnome, KDE or xfce4." + "Check if xdg-open can be used, i.e. we are on Gnome, KDE, Xfce4 or LXDE." (and (getenv "DISPLAY") (executable-find "xdg-open") ;; xdg-open may call gnome-open and that does not wait for its child ;; to finish. This child may then be killed when the parent dies. - ;; Use nohup to work around. + ;; Use nohup to work around. See bug#7166, bug#8917, bug#9779 and + ;; http://lists.gnu.org/archive/html/emacs-devel/2009-07/msg00279.html (executable-find "nohup") (or (getenv "GNOME_DESKTOP_SESSION_ID") ;; GNOME_DESKTOP_SESSION_ID is deprecated, check on Dbus also. @@ -966,7 +968,9 @@ "/bin/sh" nil nil nil "-c" "xprop -root _DT_SAVE_MODE|grep xfce4")) - (error nil))))) + (error nil)) + (member (getenv "DESKTOP_SESSION") '("LXDE" "Lubuntu")) + (equal (getenv "XDG_CURRENT_DESKTOP") "LXDE")))) ;;;###autoload ------------------------------------------------------------ revno: 106129 fixes bug(s): http://debbugs.gnu.org/9779 committer: Juri Linkov branch nick: trunk timestamp: Wed 2011-10-19 12:03:39 +0300 message: * lisp/net/browse-url.el (browse-url-browser-function): Add "Chromium". (browse-url-chromium-program, browse-url-chromium-arguments): New defcustoms. (browse-url-default-browser): Check for `browse-url-chromium' and call `browse-url-chromium-program'. (browse-url-chromium): New command. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-18 14:31:27 +0000 +++ lisp/ChangeLog 2011-10-19 09:03:39 +0000 @@ -1,3 +1,12 @@ +2011-10-19 Juri Linkov + + * net/browse-url.el (browse-url-browser-function): Add "Chromium". + (browse-url-chromium-program, browse-url-chromium-arguments): + New defcustoms. + (browse-url-default-browser): Check for `browse-url-chromium' and + call `browse-url-chromium-program'. + (browse-url-chromium): New command. (Bug#9779) + 2011-10-18 Juanma Barranquero * facemenu.el (list-colors-duplicates): On Windows, detect more === modified file 'lisp/net/browse-url.el' --- lisp/net/browse-url.el 2011-08-21 01:01:12 +0000 +++ lisp/net/browse-url.el 2011-10-19 09:03:39 +0000 @@ -36,6 +36,7 @@ ;; Function Browser Earliest version ;; browse-url-mozilla Mozilla Don't know ;; browse-url-firefox Firefox Don't know (tried with 1.0.1) +;; browse-url-chromium Chromium 3.0 ;; browse-url-galeon Galeon Don't know ;; browse-url-epiphany Epiphany Don't know ;; browse-url-netscape Netscape 1.1b1 @@ -230,6 +231,7 @@ :value browse-url-w3-gnudoit) (function-item :tag "Mozilla" :value browse-url-mozilla) (function-item :tag "Firefox" :value browse-url-firefox) + (function-item :tag "Chromium" :value browse-url-chromium) (function-item :tag "Galeon" :value browse-url-galeon) (function-item :tag "Epiphany" :value browse-url-epiphany) (function-item :tag "Netscape" :value browse-url-netscape) @@ -336,6 +338,22 @@ :type '(repeat (string :tag "Argument")) :group 'browse-url) +(defcustom browse-url-chromium-program + (let ((candidates '("chromium" "chromium-browser"))) + (while (and candidates (not (executable-find (car candidates)))) + (setq candidates (cdr candidates))) + (or (car candidates) "chromium")) + "The name by which to invoke Chromium." + :type 'string + :version "24.1" + :group 'browse-url) + +(defcustom browse-url-chromium-arguments nil + "A list of strings to pass to Chromium as arguments." + :type '(repeat (string :tag "Argument")) + :version "24.1" + :group 'browse-url) + (defcustom browse-url-galeon-program "galeon" "The name by which to invoke Galeon." :type 'string @@ -913,6 +931,7 @@ ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz) ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ((executable-find browse-url-firefox-program) 'browse-url-firefox) + ((executable-find browse-url-chromium-program) 'browse-url-chromium) ((executable-find browse-url-galeon-program) 'browse-url-galeon) ((executable-find browse-url-kde-program) 'browse-url-kde) ((executable-find browse-url-netscape-program) 'browse-url-netscape) @@ -1141,6 +1160,22 @@ (append browse-url-firefox-startup-arguments (list url)))))) ;;;###autoload +(defun browse-url-chromium (url &optional new-window) + "Ask the Chromium WWW browser to load URL. +Default to the URL around or before point. The strings in +variable `browse-url-chromium-arguments' are also passed to +Chromium." + (interactive (browse-url-interactive-arg "URL: ")) + (setq url (browse-url-encode-url url)) + (let* ((process-environment (browse-url-process-environment))) + (apply 'start-process + (concat "chromium " url) nil + browse-url-chromium-program + (append + browse-url-chromium-arguments + (list url))))) + +;;;###autoload (defun browse-url-galeon (url &optional new-window) "Ask the Galeon WWW browser to load URL. Default to the URL around or before point. The strings in variable ------------------------------------------------------------ revno: 106128 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-10-19 00:21:52 -0400 message: Update Search chapter in Emacs manual. * doc/emacs/search.texi (Repeat Isearch, Error in Isearch): Add kindex entries. (Isearch Yank): Document isearch-yank-pop. (Isearch Scroll): Refer to C-l instead of unbound `recenter'. (Other Repeating Search): Document Occur Edit mode. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2011-10-18 21:11:17 +0000 +++ admin/FOR-RELEASE 2011-10-19 04:21:52 +0000 @@ -191,7 +191,7 @@ regs.texi cyd rmail.texi screen.texi cyd -search.texi +search.texi cyd sending.texi text.texi trouble.texi === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-18 21:11:17 +0000 +++ doc/emacs/ChangeLog 2011-10-19 04:21:52 +0000 @@ -1,3 +1,11 @@ +2011-10-19 Chong Yidong + + * search.texi (Repeat Isearch, Error in Isearch): Add kindex + entries. + (Isearch Yank): Document isearch-yank-pop. + (Isearch Scroll): Refer to C-l instead of unbound `recenter'. + (Other Repeating Search): Document Occur Edit mode. + 2011-10-18 Chong Yidong * display.texi (Fringes): Move overflow-newline-into-fringe here, === modified file 'doc/emacs/search.texi' --- doc/emacs/search.texi 2011-10-18 21:11:17 +0000 +++ doc/emacs/search.texi 2011-10-19 04:21:52 +0000 @@ -166,23 +166,27 @@ you have already seen. @cindex search ring +@kindex M-n @r{(Incremental search)} +@kindex M-p @r{(Incremental search)} To reuse earlier search strings, use the @dfn{search ring}. The commands @kbd{M-p} and @kbd{M-n} move through the ring to pick a search string to reuse. These commands leave the selected search ring -element in the minibuffer, where you can edit it. To edit the current -search string in the minibuffer without replacing it with items from -the search ring, type @kbd{M-e}. Type @kbd{C-s} or @kbd{C-r} to -terminate editing the string and search for it. +element in the minibuffer, where you can edit it. + +@kindex M-e @r{(Incremental search)} + To edit the current search string in the minibuffer without +replacing it with items from the search ring, type @kbd{M-e}. Type +@kbd{C-s} or @kbd{C-r} to finish editing the string and search for it. @node Error in Isearch @subsection Errors in Incremental Search If your string is not found at all, the echo area says @samp{Failing -I-Search}. The cursor is after the place where Emacs found as much of -your string as it could. Thus, if you search for @samp{FOOT}, and -there is no @samp{FOOT}, you might see the cursor after the @samp{FOO} -in @samp{FOOL}. In the echo area, the part of the search string that -failed to match is highlighted using the customizable face +I-Search}, and the cursor moves past the place where Emacs found as +much of your string as it could. Thus, if you search for @samp{FOOT}, +and there is no @samp{FOOT}, you might see the cursor after the +@samp{FOO} in @samp{FOOL}. In the echo area, the part of the search +string that failed to match is highlighted using the face @code{isearch-fail}. At this point, there are several things you can do. If your string @@ -195,6 +199,7 @@ entirely, returning point to where it was when the search started. @cindex quitting (in search) +@kindex C-g @r{(Incremental search)} The quit command, @kbd{C-g}, does special things during searches; just what it does depends on the status of the search. If the search has found what you specified and is waiting for input, @kbd{C-g} @@ -270,62 +275,70 @@ @node Isearch Yank @subsection Isearch Yanking +@kindex C-y @r{(Incremental search)} +@kindex M-y @r{(Incremental search)} +@findex isearch-yank-kill +@findex isearch-yank-pop Within incremental search, @kbd{C-y} (@code{isearch-yank-kill}) -copies text from the kill ring into the search string. It uses the -same text that @kbd{C-y}, outside of incremental search, would -normally yank into the buffer. @kbd{Mouse-2} in the echo area does -the same. @xref{Yanking}. - - @kbd{C-w} (@code{isearch-yank-word-or-char}) grabs the next -character or word at point, and adds it to the search string. This is -convenient for searching for another occurrence of the text at point. -(The decision, whether to copy a character or a word, is heuristic.) - - Similarly, @kbd{M-s C-e} (@code{isearch-yank-line}) grabs the rest -of the current line, and adds it to the search string. If point is -already at the end of a line, it grabs the entire next line. +appends the current kill to the search string. @kbd{M-y} +(@code{isearch-yank-pop}), if called after @kbd{C-y}, replaces that +appended text with an earlier kill, similar to the usual @kbd{M-y} +(@code{yank-pop}) command (@pxref{Yanking}). @kbd{Mouse-2} appends +the current X selection (@pxref{Primary Selection}). + +@kindex C-w @r{(Incremental search)} +@findex isearch-yank-word-or-char + @kbd{C-w} (@code{isearch-yank-word-or-char}) appends the next +character or word at point to the search string. This is an easy way +to search for another occurrence of the text at point. (The decision +of whether to copy a character or a word is heuristic.) + +@kindex M-s C-e @r{(Incremental search)} +@findex isearch-yank-line + Similarly, @kbd{M-s C-e} (@code{isearch-yank-line}) appends the rest +of the current line to the search string. If point is already at the +end of a line, it appends the next line. If the search is currently case-insensitive, both @kbd{C-w} and @kbd{M-s C-e} convert the text they copy to lower case, so that the search remains case-insensitive. - @kbd{C-M-w} and @kbd{C-M-y} modify the search string by only one -character at a time: @kbd{C-M-w} deletes the last character from the -search string and @kbd{C-M-y} copies the character after point to the -end of the search string. An alternative method to add the character -after point into the search string is to enter the minibuffer by -@kbd{M-e} and to type @kbd{C-f} at the end of the search string in the -minibuffer. +@kindex C-M-w @r{(Incremental search)} +@kindex C-M-y @r{(Incremental search)} +@findex isearch-del-char +@findex isearch-yank-char + @kbd{C-M-w} (@code{isearch-del-char}) deletes the last character +from the search string, and @kbd{C-M-y} (@code{isearch-yank-char}) +appends the character after point to the the search string. An +alternative method to add the character after point is to enter the +minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f} +at the end of the search string in the minibuffer. @node Isearch Scroll @subsection Scrolling During Incremental Search @vindex isearch-allow-scroll - You can enable the use of vertical scrolling during incremental -search (without exiting the search) by setting the customizable -variable @code{isearch-allow-scroll} to a non-@code{nil} value. This -applies to using the vertical scroll-bar and to certain keyboard -commands such as @code{scroll-down-command}, @code{scroll-up-command} -and @code{recenter} (@pxref{Scrolling}). You must run these commands -via their key sequences to stay in the search---typing @kbd{M-x} will -terminate the search. You can give prefix arguments to these commands -in the usual way. - - This feature won't let you scroll the current match out of visibility, -however. - - The feature also affects some other commands, such as @kbd{C-x 2} -(@code{split-window-vertically}) and @kbd{C-x ^} -(@code{enlarge-window}) which don't exactly scroll but do affect where -the text appears on the screen. In general, it applies to any command -whose name has a non-@code{nil} @code{isearch-scroll} property. So you -can control which commands are affected by changing these properties. + Normally, scrolling commands exit incremental search. If you change +the variable @code{isearch-allow-scroll} to a non-@code{nil} value, +that enables the use of the scroll-bar, as well as keyboard scrolling +commands like @kbd{C-v}, @kbd{M-v}, and @kbd{C-l} (@pxref{Scrolling}). +This applies only to calling these commands via their bound key +sequences---typing @kbd{M-x} will still exit the search. You can give +prefix arguments to these commands in the usual way. This feature +won't let you scroll the current match out of visibility, however. + + The @code{isearch-allow-scroll} feature also affects some other +commands, such as @kbd{C-x 2} (@code{split-window-vertically}) and +@kbd{C-x ^} (@code{enlarge-window}), which don't exactly scroll but do +affect where the text appears on the screen. It applies to any +command whose name has a non-@code{nil} @code{isearch-scroll} +property. So you can control which commands are affected by changing +these properties. For example, to make @kbd{C-h l} usable within an incremental search in all future Emacs sessions, use @kbd{C-h c} to find what command it -runs. (You type @kbd{C-h c C-h l}; it says @code{view-lossage}.) -Then you can put the following line in your @file{.emacs} file -(@pxref{Init File}): +runs (@pxref{Key Help}), which is @code{view-lossage}. Then you can +put the following line in your init file (@pxref{Init File}): @example (put 'view-lossage 'isearch-scroll t) @@ -380,18 +393,14 @@ string with @key{RET}, and then the search takes place. If the string is not found, the search command signals an error. - When you type @kbd{C-s @key{RET}}, the @kbd{C-s} invokes incremental -search as usual. That command is specially programmed to invoke -nonincremental search, @code{search-forward}, if the string you -specify is empty. (Such an empty argument would otherwise be -useless.) @kbd{C-r @key{RET}} does likewise, for a reverse -incremental search. - @findex search-forward @findex search-backward - Forward and backward nonincremental searches are implemented by the -commands @code{search-forward} and @code{search-backward}. These -commands may be bound to other keys in the usual manner. + When you type @kbd{C-s @key{RET}}, the @kbd{C-s} invokes incremental +search as usual. That command is specially programmed to invoke the +command for nonincremental search, @code{search-forward}, if the +string you specify is empty. (Such an empty argument would otherwise +be useless.) @kbd{C-r @key{RET}} does likewise, invoking the command +@code{search-backward}. @node Word Search @section Word Search @@ -451,7 +460,7 @@ that denotes a class of alternative strings to match. GNU Emacs provides both incremental and nonincremental ways to search for a match for a regexp. The syntax of regular expressions is explained in -the following section. +the next section. @table @kbd @item C-M-s @@ -506,7 +515,7 @@ @findex re-search-forward @findex re-search-backward - Nonincremental search for a regexp is done by the functions + Nonincremental search for a regexp is done with the commands @code{re-search-forward} and @code{re-search-backward}. You can invoke these with @kbd{M-x}, or by way of incremental regexp search with @kbd{C-M-s @key{RET}} and @kbd{C-M-r @key{RET}}. @@ -916,9 +925,9 @@ Searches in Emacs normally ignore the case of the text they are searching through, if you specify the text in lower case. Thus, if you specify searching for @samp{foo}, then @samp{Foo} and @samp{foo} -are also considered a match. Regexps, and in particular character -sets, are included: @samp{[ab]} would match @samp{a} or @samp{A} or -@samp{b} or @samp{B}.@refill +also match. Regexps, and in particular character sets, behave +likewise: @samp{[ab]} matches @samp{a} or @samp{A} or @samp{b} or +@samp{B}.@refill An upper-case letter anywhere in the incremental search string makes the search case-sensitive. Thus, searching for @samp{Foo} does not find @@ -960,8 +969,8 @@ each occurrence of the pattern and asks you whether to replace it. The replace commands normally operate on the text from point to the -end of the buffer. When the mark is active, they operate on the -region instead (@pxref{Mark}). The basic replace commands replace one +end of the buffer. When the region is active, they operate on it +instead (@pxref{Mark}). The basic replace commands replace one @dfn{search string} (or regexp) with one @dfn{replacement string}. It is possible to perform several replacements in parallel, using the command @code{expand-region-abbrevs} (@pxref{Expanding Abbrevs}). @@ -998,7 +1007,7 @@ @xref{Mark Ring}. A prefix argument restricts replacement to matches that are -surrounded by word boundaries. The argument's value doesn't matter. +surrounded by word boundaries. @xref{Replacement and Case}, for details about case-sensitivity in replace commands. @@ -1128,10 +1137,8 @@ @table @kbd @item M-% @var{string} @key{RET} @var{newstring} @key{RET} -@itemx M-x query-replace @key{RET} @var{string} @key{RET} @var{newstring} @key{RET} Replace some occurrences of @var{string} with @var{newstring}. @item C-M-% @var{regexp} @key{RET} @var{newstring} @key{RET} -@itemx M-x query-replace-regexp @key{RET} @var{regexp} @key{RET} @var{newstring} @key{RET} Replace some matches for @var{regexp} with @var{newstring}. @end table @@ -1144,7 +1151,7 @@ @code{query-replace} works just like @code{replace-string} (@pxref{Unconditional Replace}). In particular, it preserves case provided @code{case-replace} is non-@code{nil}, as it normally is -(@pxref{Replacement and Case}). A numeric argument means consider +(@pxref{Replacement and Case}). A numeric argument means to consider only occurrences that are bounded by word-delimiter characters. @kindex C-M-% @@ -1157,7 +1164,7 @@ These commands highlight the current match using the face @code{query-replace}. They highlight other matches using @code{lazy-highlight} just like incremental search (@pxref{Incremental -Search}). By default, @code{query-replace-regexp} will show +Search}). By default, @code{query-replace-regexp} will show the substituted replacement string for the current match in the minibuffer. If you want to keep special sequences @samp{\&} and @samp{\@var{n}} unexpanded, customize @@ -1290,6 +1297,8 @@ This command is just like @code{multi-isearch-buffers}, except it performs an incremental regexp search. +@cindex Occur mode +@cindex mode, Occur @item M-x occur Prompt for a regexp, and display a list showing each line in the buffer that contains a match for it. To limit the search to part of @@ -1300,16 +1309,22 @@ @kindex RET @r{(Occur mode)} @kindex o @r{(Occur mode)} @kindex C-o @r{(Occur mode)} -The buffer @samp{*Occur*} containing the output serves as a menu for -finding the occurrences in their original context. Click -@kbd{Mouse-2} on an occurrence listed in @samp{*Occur*}, or position -point there and type @key{RET}; this switches to the buffer that was -searched and moves point to the original of the chosen occurrence. -@kbd{o} and @kbd{C-o} display the match in another window; @kbd{C-o} -does not select it. - -After using @kbd{M-x occur}, you can use @code{next-error} to visit -the occurrences found, one by one. @ref{Compilation Mode}. +In the @samp{*Occur*} buffer, you can click on each entry, or move +point there and type @key{RET}, to visit the corresponding position in +the buffer that was searched. @kbd{o} and @kbd{C-o} display the match +in another window; @kbd{C-o} does not select it. Alternatively, you +can use the @kbd{C-x `} (@code{next-error}) command to visit the +occurrences one by one (@pxref{Compilation Mode}). + +@cindex Occur Edit mode +@cindex mode, Occur Edit +Typing @kbd{e} in the @samp{*Occur*} buffer switches to Occur Edit +mode, in which edits made to the entries are also applied to the text +in the originating buffer. Type @kbd{C-c C-c} to return to Occur +mode. + +The command @kbd{M-x list-matching-lines} is a synonym for @kbd{M-x +occur}. @kindex M-s o @item M-s o @@ -1317,9 +1332,6 @@ string search. You can also run @kbd{M-s o} when an incremental search is active; this uses the current search string. -@item M-x list-matching-lines -Synonym for @kbd{M-x occur}. - @item M-x multi-occur This command is just like @code{occur}, except it is able to search through multiple buffers. It asks you to specify the buffer names one === modified file 'etc/NEWS' --- etc/NEWS 2011-10-18 21:11:17 +0000 +++ etc/NEWS 2011-10-19 04:21:52 +0000 @@ -448,7 +448,7 @@ +++ *** C-y in Isearch is now bound to isearch-yank-kill, instead of isearch-yank-line. ---- ++++ *** M-y in Isearch is now bound to isearch-yank-pop, instead of isearch-yank-kill. +++ @@ -883,6 +883,7 @@ * New Modes and Packages in Emacs 24.1 ++++ ** Occur Edit mode applies edits made in *Occur* buffers to the original buffers. It is bound to "e" in Occur mode. ------------------------------------------------------------ revno: 106127 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-10-18 17:11:17 -0400 message: More edits to Display chapter of Emacs manual. * doc/emacs/display.texi (Fringes): Move overflow-newline-into-fringe here, from Line Truncation node. (Standard Faces): Note that only the background of the cursor face has an effect. (Cursor Display): Fix descriptions of cursor face and bar cursor blinking. (Text Display): Document nobreak-char-display more clearly. (Line Truncation): Add xref to Split Window node. (Display Custom): Don't bother documenting baud-rate or no-redraw-on-reenter. * doc/emacs/search.texi (Slow Isearch): Node removed. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2011-10-15 16:37:45 +0000 +++ admin/FOR-RELEASE 2011-10-18 21:11:17 +0000 @@ -162,7 +162,7 @@ custom.texi dired.texi dired-xtra.texi -display.texi +display.texi cyd emacs.texi emacs-xtra.texi emerge-xtra.texi === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-18 06:52:32 +0000 +++ doc/emacs/ChangeLog 2011-10-18 21:11:17 +0000 @@ -1,3 +1,18 @@ +2011-10-18 Chong Yidong + + * display.texi (Fringes): Move overflow-newline-into-fringe here, + from Line Truncation node. + (Standard Faces): Note that only the background of the cursor face + has an effect. + (Cursor Display): Fix descriptions of cursor face + and bar cursor blinking. + (Text Display): Document nobreak-char-display more clearly. + (Line Truncation): Add xref to Split Window node. + (Display Custom): Don't bother documenting baud-rate or + no-redraw-on-reenter. + + * search.texi (Slow Isearch): Node removed. + 2011-10-18 Glenn Morris * maintaining.texi (Registering): Remove vc-initial-comment. (Bug#9745) === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-10-18 01:42:28 +0000 +++ doc/emacs/display.texi 2011-10-18 21:11:17 +0000 @@ -554,7 +554,7 @@ The face for displaying control characters and escape sequences (@pxref{Text Display}). @item nobreak-space -The face for displaying ``non-breaking'' space characters (@pxref{Text +The face for displaying ``no-break'' space characters (@pxref{Text Display}). @end table @@ -599,7 +599,8 @@ between the text area and the window's right and left borders.) @xref{Fringes}. @item cursor -This face determines the color of the text cursor. +The @code{:background} attribute of this face specifies the color of +the text cursor. @xref{Cursor Display}. @item tooltip This face is used for tooltip text. By default, if Emacs is built with GTK support, tooltips are drawn via GTK and this face has no @@ -901,9 +902,14 @@ @section Window Fringes @cindex fringes - On a graphical display, each Emacs window normally has narrow +@findex set-fringe-style +@findex fringe-mode + On graphical displays, each Emacs window normally has narrow @dfn{fringes} on the left and right edges. The fringes are used to display symbols that provide information about the text in the window. +You can type @kbd{M-x fringe-mode} to disable the fringes, or modify +their width. This command affects fringes in all frames; to modify +fringes on the selected frame only, use @kbd{M-x set-fringe-style}. The most common use of the fringes is to indicate a continuation line (@pxref{Continuation Lines}). When one line of text is split @@ -924,17 +930,18 @@ boundaries (@pxref{Displaying Boundaries}), and where a program you are debugging is executing (@pxref{Debuggers}). -@findex set-fringe-style -@findex fringe-mode - You can enable and disable the fringes for all frames using -@kbd{M-x fringe-mode}. To enable and disable the fringes -for the selected frame, use @kbd{M-x set-fringe-style}. +@vindex overflow-newline-into-fringe + The fringe is also used for drawing the cursor, if the current line +is exactly as wide as the window and point is at the end of the line. +To disable this, change the variable +@code{overflow-newline-into-fringe} to @code{nil}; this causes Emacs +to continue or truncate lines that are exactly as wide as the window. @node Displaying Boundaries @section Displaying Boundaries @vindex indicate-buffer-boundaries - On a graphical display, Emacs can indicate the buffer boundaries in + On graphical displays, Emacs can indicate the buffer boundaries in the fringes. If you enable this feature, the first line and the last line are marked with angle images in the fringes. This can be combined with up and down arrow images which say whether it is @@ -1127,14 +1134,15 @@ @vindex display-time-mail-file @vindex display-time-mail-directory The word @samp{Mail} appears after the load level if there is mail -for you that you have not read yet. On a graphical display you can use -an icon instead of @samp{Mail} by customizing -@code{display-time-use-mail-icon}; this may save some space on the mode -line. You can customize @code{display-time-mail-face} to make the mail -indicator prominent. Use @code{display-time-mail-file} to specify -the mail file to check, or set @code{display-time-mail-directory} -to specify the directory to check for incoming mail (any nonempty regular -file in the directory is considered as ``newly arrived mail''). +for you that you have not read yet. On graphical displays, you can +use an icon instead of @samp{Mail} by customizing +@code{display-time-use-mail-icon}; this may save some space on the +mode line. You can customize @code{display-time-mail-face} to make +the mail indicator prominent. Use @code{display-time-mail-file} to +specify the mail file to check, or set +@code{display-time-mail-directory} to specify the directory to check +for incoming mail (any nonempty regular file in the directory is +considered as ``newly arrived mail''). @cindex mail (on mode line) @findex display-battery-mode @@ -1152,7 +1160,7 @@ @cindex mode line, 3D appearance @cindex attributes of mode line, changing @cindex non-integral number of lines in a window - On a graphical display, the mode line is drawn as a 3D box. If you + On graphical displays, the mode line is drawn as a 3D box. If you don't like this effect, you can disable it by customizing the @code{mode-line} face and setting its @code{box} attribute to @code{nil}. @xref{Face Customization}. @@ -1218,17 +1226,23 @@ octal escape sequences instead of caret escape sequences. @vindex nobreak-char-display -@cindex non-breaking space, display -@cindex non-breaking hyphen, display -@cindex soft hyphen, display - There are two special ``non-breaking'' versions of the space and -hyphen characters, which are used where a line should not be broken. -Emacs normally displays these characters with special faces -(respectively, @code{nobreak-space} and @code{escape-glyph}) to -distinguish them from ordinary spaces and hyphens. You can turn off -this feature by setting the variable @code{nobreak-char-display} to -@code{nil}. If you set the variable to any other value, that means to -prefix these characters with an escape character. +@cindex non-breaking space +@cindex non-breaking hyphen +@cindex soft hyphen + Some non-@acronym{ASCII} characters have the same appearance as an +@acronym{ASCII} space or hyphen (minus) character. Such characters +can cause problems if they are entered into a buffer without your +realization, e.g. by yanking; for instance, source code compilers +typically do not treat non-@acronym{ASCII} spaces as whitespace +characters. To deal with this problem, Emacs displays such characters +specially: it displays @code{U+00A0} (no-break space) with the +@code{nobreak-space} face, and it displays @code{U+00AD} (soft +hyphen), @code{U+2010} (hyphen), and @code{U+2011} (non-breaking +hyphen) with the @code{escape-glyph} face. To disable this, change +the variable @code{nobreak-char-display} to @code{nil}. If you give +this variable a non-@code{nil} and non-@code{t} value, Emacs instead +displays such characters as a highlighted backslash followed by a +space or hyphen. You can customize the way any particular character code is displayed by means of a display table. @xref{Display Tables,, Display Tables, @@ -1246,48 +1260,61 @@ @node Cursor Display @section Displaying the Cursor +@cindex text cursor + +@vindex visible-cursor + On a text terminal, the cursor's appearance is controlled by the +terminal, largely out of the control of Emacs. Some terminals offer +two different cursors: a ``visible'' static cursor, and a ``very +visible'' blinking cursor. By default, Emacs uses the very visible +cursor, and switches to it when you start or resume Emacs. If the +variable @code{visible-cursor} is @code{nil} when Emacs starts or +resumes, it uses the normal cursor. + +@cindex cursor face +@vindex cursor-type + On a graphical display, many more properties of the text cursor can +be altered. To customize its color, change the @code{:background} +attribute of the face named @code{cursor} (@pxref{Face +Customization}). (The other attributes of this face have no effect; +the text shown under the cursor is drawn using the frame's background +color.) To change its shape, customize the buffer-local variable +@code{cursor-type}; possible values are @code{box} (the default), +@code{hollow} (a hollow box), @code{bar} (a vertical bar), @code{(bar +. @var{n})} (a vertical bar @var{n} pixels wide), @code{hbar} (a +horizontal bar), @code{(hbar . @var{n})} (a horizontal bar @var{n} +pixels tall), or @code{nil} (no cursor at all). @findex blink-cursor-mode +@cindex cursor, blinking +@cindex blinking cursor @vindex blink-cursor-alist -@cindex cursor, locating visually -@cindex cursor, blinking - You can customize the cursor's color, and whether it blinks, using -the @code{cursor} Custom group (@pxref{Easy Customization}). On -a graphical display, the command @kbd{M-x blink-cursor-mode} enables -or disables the blinking of the cursor. (On text terminals, the -terminal itself blinks the cursor, and Emacs has no control over it.) -You can control how the cursor appears when it blinks off by setting -the variable @code{blink-cursor-alist}. - -@vindex cursor-type - You can change the shape of the cursor from the default ``box'' look -to a bar by altering the @code{cursor-type} variable. - -@vindex visible-cursor - Some text terminals offer two different cursors: the normal cursor -and the very visible cursor, where the latter may be e.g. bigger or -blinking. By default Emacs uses the very visible cursor, and switches -to it when you start or resume Emacs. If the variable -@code{visible-cursor} is @code{nil} when Emacs starts or resumes, it -doesn't switch, so it uses the normal cursor. - -@cindex cursor in non-selected windows -@vindex cursor-in-non-selected-windows - Normally, the cursor appears in non-selected windows without -blinking, with the same appearance as when the blinking cursor blinks -``off.'' For a box cursor, this is a hollow box; for a bar cursor, -this is a thinner bar. To turn off cursors in non-selected windows, -customize the variable @code{cursor-in-non-selected-windows} and -assign it a @code{nil} value. + To disable cursor blinking, change the variable +@code{blink-cursor-mode} to @code{nil} (@pxref{Easy Customization}), +or add the line @code{(blink-cursor-mode 0)} to your init file. +Alternatively, you can change how the cursor looks when it ``blinks +off'' by customizing the list variable @code{blink-cursor-alist}. +Each element in the list should have the form @code{(@var{on-type} +. @var{off-type})}; this means that if the cursor is displayed as +@var{on-type} when it blinks on (where @var{on-type} is one of the +cursor types described above), then it is displayed as @var{off-type} +when it blinks off. @vindex x-stretch-cursor @cindex wide block cursor - On graphical displays, Emacs can optionally draw the block cursor -as wide as the character under the cursor---for example, if the cursor -is on a tab character, it would cover the full width occupied by that -tab character. To enable this feature, set the variable + Some characters, such as tab characters, are ``extra wide''. When +the cursor is positioned over such a character, it is normally drawn +with the default character width. You can make the cursor stretch to +cover wide characters, by changing the variable @code{x-stretch-cursor} to a non-@code{nil} value. +@cindex cursor in non-selected windows +@vindex cursor-in-non-selected-windows + The cursor normally appears in non-selected windows as a +non-blinking hollow box. (For a bar cursor, it instead appears as a +thinner bar.) To turn off cursors in non-selected windows, change the +variable @code{cursor-in-non-selected-windows} to @code{nil}. + @findex hl-line-mode @findex global-hl-line-mode @cindex highlight current line @@ -1297,18 +1324,17 @@ global-hl-line-mode} enables or disables the same mode globally. @node Line Truncation -@section Truncation of Lines +@section Line Truncation @cindex truncation @cindex line truncation, and fringes - As an alternative to continuation (@pxref{Continuation Lines}), Emacs -can display long lines by @dfn{truncation}. This means that all the -characters that do not fit in the width of the screen or window do not -appear at all. On graphical displays, a small straight arrow in the -fringe indicates truncation at either end of the line. On text-only -terminals, @samp{$} appears in the leftmost column when there is text -truncated to the left, and in the rightmost column when there is text -truncated to the right. + As an alternative to continuation (@pxref{Continuation Lines}), +Emacs can display long lines by @dfn{truncation}. This means that all +the characters that do not fit in the width of the screen or window do +not appear at all. On graphical displays, a small straight arrow in +the fringe indicates truncation at either end of the line. On +text-only terminals, this is indicated with @samp{$} signs in the +leftmost and/or rightmost columns. @vindex truncate-lines @findex toggle-truncate-lines @@ -1320,21 +1346,12 @@ are truncated; if it is @code{nil}, they are continued onto multiple screen lines. Setting the variable @code{truncate-lines} in any way makes it local to the current buffer; until that time, the default -value is in effect. The default value is normally @code{nil}. - -@c @vindex truncate-partial-width-windows @c Idx entry is in Split Windows. - If the variable @code{truncate-partial-width-windows} is -non-@code{nil}, it forces truncation rather than continuation in any -window less than the full width of the screen or frame, regardless of -the value of @code{truncate-lines}. See also @ref{Display,, Display, -elisp, The Emacs Lisp Reference Manual}. - -@vindex overflow-newline-into-fringe - If the variable @code{overflow-newline-into-fringe} is -non-@code{nil} on a graphical display, then Emacs does not continue or -truncate a line which is exactly as wide as the window. Instead, the -newline overflows into the right fringe, and the cursor appears in the -fringe when positioned on that newline. +value, which is normally @code{nil}, is in effect. + +@vindex truncate-partial-width-windows + If a split window becomes too narrow, Emacs may automatically enable +line truncation. @xref{Split Window}, for the variable +@code{truncate-partial-width-windows} which controls this. @node Visual Line Mode @section Visual Line Mode @@ -1387,11 +1404,8 @@ @node Display Custom @section Customization of Display - This section describes variables (@pxref{Variables}) that you can -change to customize how Emacs displays. Beginning users can skip -it. -@c the reason for that pxref is because an xref early in the -@c ``echo area'' section leads here. + This section describes variables that control miscellaneous aspects +of the appearance of the Emacs screen. Beginning users can skip it. @vindex visible-bell If the variable @code{visible-bell} is non-@code{nil}, Emacs attempts @@ -1405,18 +1419,6 @@ to start, or zero, meaning don't echo at all. The value takes effect when there is someting to echo. @xref{Echo Area}. -@vindex baud-rate - The variable @anchor{baud-rate}@code{baud-rate} holds the output -speed of the terminal. Setting this variable does not change the -speed of actual data transmission, but the value is used for -calculations. On text-only terminals, it affects padding, and -decisions about whether to scroll part of the screen or redraw it -instead. It also affects the behavior of incremental search. On -graphical displays, @code{baud-rate} is only used to determine how -frequently to look for pending input during display updating. A -higher value of @code{baud-rate} means that check for pending input -will be done less frequently. - @cindex mouse pointer @cindex hourglass pointer display @vindex display-hourglass @@ -1458,15 +1460,3 @@ result in text that is hard to read. Call the function @code{tty-suppress-bold-inverse-default-colors} with a non-@code{nil} argument to suppress the effect of bold-face in this case. - -@vindex no-redraw-on-reenter - On a text-only terminal, when you reenter Emacs after suspending, Emacs -normally clears the screen and redraws the entire display. On some -terminals with more than one page of memory, it is possible to arrange -the termcap entry so that the @samp{ti} and @samp{te} strings (output -to the terminal when Emacs is entered and exited, respectively) switch -between pages of memory so as to use one page for Emacs and another -page for other output. On such terminals, you might want to set the variable -@code{no-redraw-on-reenter} non-@code{nil}; this tells Emacs to -assume, when resumed, that the screen page it is using still contains -what Emacs last wrote there. === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-10-18 01:42:28 +0000 +++ doc/emacs/emacs.texi 2011-10-18 21:11:17 +0000 @@ -388,7 +388,6 @@ or else edit the search string. * Isearch Scroll:: Scrolling during an incremental search. * Isearch Minibuffer:: Incremental search of the minibuffer history. -* Slow Isearch:: Incremental search features for slow terminals. Replacement Commands === modified file 'doc/emacs/search.texi' --- doc/emacs/search.texi 2011-10-01 21:54:33 +0000 +++ doc/emacs/search.texi 2011-10-18 21:11:17 +0000 @@ -60,7 +60,6 @@ or else edit the search string. * Isearch Scroll:: Scrolling during an incremental search. * Isearch Minibuffer:: Incremental search of the minibuffer history. -* Slow Isearch:: Incremental search features for slow terminals. @end menu @node Basic Isearch @@ -362,30 +361,6 @@ afterwards. Cancelling the search, with @kbd{C-g}, restores the contents of the minibuffer when you began the search. -@node Slow Isearch -@subsection Slow Terminal Incremental Search - - Incremental search on a slow terminal uses a modified style of display -that is designed to take less time. Instead of redisplaying the buffer at -each place the search gets to, it creates a new single-line window and uses -that to display the line that the search has found. The single-line window -comes into play as soon as point moves outside of the text that is already -on the screen. - - When you terminate the search, the single-line window is removed. -Emacs then redisplays the window in which the search was done, to show -its new position of point. - -@vindex search-slow-speed - The slow terminal style of display is used when the terminal baud rate is -less than or equal to the value of the variable @code{search-slow-speed}, -initially 1200. See also the discussion of the variable @code{baud-rate} -(@pxref{baud-rate,, Customization of Display}). - -@vindex search-slow-window-lines - The number of lines to use in slow terminal search display is controlled -by the variable @code{search-slow-window-lines}. Its normal value is 1. - @node Nonincremental Search @section Nonincremental Search @cindex nonincremental search === modified file 'etc/NEWS' --- etc/NEWS 2011-10-18 15:55:20 +0000 +++ etc/NEWS 2011-10-18 21:11:17 +0000 @@ -109,9 +109,9 @@ *** Completion can cycle, depending on completion-cycle-threshold. +++ *** New completion style `substring'. - ++++ *** Completion style can be set per-category `completion-category-overrides'. - ++++ *** Completion of buffers now uses substring completion by default. ** Mail changes @@ -225,6 +225,10 @@ --- *** New input methods for Farsi: farsi and farsi-translit. ++++ +*** `nobreak-char-display' now also highlights Unicode hyphen chars +(U+2010 and U+2011). + ** Improved GTK integration *** GTK scroll-bars are now placed on the right by default. ------------------------------------------------------------ revno: 106126 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-10-18 17:07:56 -0400 message: Have nobreak-char-display handle U+2010 and U+2011. See discussion at http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00747.html * src/xdisp.c (get_next_display_element): Handle U+2010 and U+2011 with nobreak-char-display too. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-18 16:56:09 +0000 +++ src/ChangeLog 2011-10-18 21:07:56 +0000 @@ -1,3 +1,8 @@ +2011-10-18 Chong Yidong + + * xdisp.c (get_next_display_element): Handle U+2010 and U+2011 + with nobreak-char-display too. + 2011-10-18 Eli Zaretskii Fix part 3 of bug#9771. === modified file 'src/xdisp.c' --- src/xdisp.c 2011-10-17 19:13:44 +0000 +++ src/xdisp.c 2011-10-18 21:07:56 +0000 @@ -6371,8 +6371,8 @@ { Lisp_Object dv; struct charset *unibyte = CHARSET_FROM_ID (charset_unibyte); - enum { char_is_other = 0, char_is_nbsp, char_is_soft_hyphen } - nbsp_or_shy = char_is_other; + int nonascii_space_p = 0; + int nonascii_hyphen_p = 0; int c = it->c; /* This is the character to display. */ if (! it->multibyte_p && ! ASCII_CHAR_P (c)) @@ -6424,10 +6424,15 @@ goto get_next; } + /* If `nobreak-char-display' is non-nil, we display + non-ASCII spaces and hyphens specially. */ if (! ASCII_CHAR_P (c) && ! NILP (Vnobreak_char_display)) - nbsp_or_shy = (c == 0xA0 ? char_is_nbsp - : c == 0xAD ? char_is_soft_hyphen - : char_is_other); + { + if (c == 0xA0) + nonascii_space_p = 1; + else if (c == 0xAD || c == 0x2010 || c == 0x2011) + nonascii_hyphen_p = 1; + } /* Translate control characters into `\003' or `^C' form. Control characters coming from a display table entry are @@ -6435,7 +6440,8 @@ the translation. This could easily be changed but I don't believe that it is worth doing. - NBSP and SOFT-HYPEN are property translated too. + The characters handled by `nobreak-char-display' must be + translated too. Non-printable characters and raw-byte characters are also translated to octal form. */ @@ -6446,14 +6452,15 @@ && it->glyph_row && (it->glyph_row->mode_line_p || it->avoid_cursor_p)) || (c != '\n' && c != '\t')) - : (nbsp_or_shy + : (nonascii_space_p + || nonascii_hyphen_p || CHAR_BYTE8_P (c) || ! CHAR_PRINTABLE_P (c)))) { - /* C is a control character, NBSP, SOFT-HYPEN, raw-byte, - or a non-printable character which must be displayed - either as '\003' or as `^C' where the '\\' and '^' - can be defined in the display table. Fill + /* C is a control character, non-ASCII space/hyphen, + raw-byte, or a non-printable character which must be + displayed either as '\003' or as `^C' where the '\\' + and '^' can be defined in the display table. Fill IT->ctl_chars with glyphs for what we have to display. Then, set IT->dpvec to these glyphs. */ Lisp_Object gc; @@ -6502,17 +6509,14 @@ goto display_control; } - /* Handle non-break space in the mode where it only gets + /* Handle non-ascii space in the mode where it only gets highlighting. */ - if (EQ (Vnobreak_char_display, Qt) - && nbsp_or_shy == char_is_nbsp) + if (nonascii_space_p && EQ (Vnobreak_char_display, Qt)) { - /* Merge the no-break-space face into the current face. */ + /* Merge `nobreak-space' into the current face. */ face_id = merge_faces (it->f, Qnobreak_space, 0, it->face_id); - - c = ' '; XSETINT (it->ctl_chars[0], ' '); ctl_len = 1; goto display_control; @@ -6552,25 +6556,21 @@ last_escape_glyph_merged_face_id = face_id; } - /* Handle soft hyphens in the mode where they only get - highlighting. */ + /* Draw non-ASCII hyphen with just highlighting: */ - if (EQ (Vnobreak_char_display, Qt) - && nbsp_or_shy == char_is_soft_hyphen) + if (nonascii_hyphen_p && EQ (Vnobreak_char_display, Qt)) { XSETINT (it->ctl_chars[0], '-'); ctl_len = 1; goto display_control; } - /* Handle non-break space and soft hyphen - with the escape glyph. */ + /* Draw non-ASCII space/hyphen with escape glyph: */ - if (nbsp_or_shy) + if (nonascii_space_p || nonascii_hyphen_p) { XSETINT (it->ctl_chars[0], escape_glyph); - c = (nbsp_or_shy == char_is_nbsp ? ' ' : '-'); - XSETINT (it->ctl_chars[1], c); + XSETINT (it->ctl_chars[1], nonascii_space_p ? ' ' : '-'); ctl_len = 2; goto display_control; } @@ -28001,12 +28001,18 @@ Vshow_trailing_whitespace = Qnil; DEFVAR_LISP ("nobreak-char-display", Vnobreak_char_display, - doc: /* *Control highlighting of nobreak space and soft hyphen. -A value of t means highlight the character itself (for nobreak space, -use face `nobreak-space'). -A value of nil means no highlighting. -Other values mean display the escape glyph followed by an ordinary -space or ordinary hyphen. */); + doc: /* Control highlighting of non-ASCII space and hyphen chars. +If the value is t, Emacs highlights non-ASCII chars which have the +same appearance as an ASCII space or hyphen, using the `nobreak-space' +or `escape-glyph' face respectively. + +U+00A0 (no-break space), U+00AD (soft hyphen), U+2010 (hyphen), and +U+2011 (non-breaking hyphen) are affected. + +Any other non-nil value means to display these characters as a escape +glyph followed by an ordinary space or hyphen. + +A value of nil means no special handling of these characters. */); Vnobreak_char_display = Qt; DEFVAR_LISP ("void-text-area-pointer", Vvoid_text_area_pointer, ------------------------------------------------------------ revno: 106125 fixes bug(s): http://debbugs.gnu.org/9786 committer: Jan D. branch nick: trunk timestamp: Tue 2011-10-18 20:12:53 +0200 message: * configure.in (GLIB_REQUIRED, GTK_REQUIRED): Set to 2.10. diff: === modified file 'ChangeLog' --- ChangeLog 2011-10-18 06:19:28 +0000 +++ ChangeLog 2011-10-18 18:12:53 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Jan Djärv + + * configure.in (GLIB_REQUIRED, GTK_REQUIRED): Set to 2.10 (Bug#9786). + 2011-10-18 Chong Yidong * make-dist: Remove Cocoa/Emacs.xcodeproj from distribution. === modified file 'configure.in' --- configure.in 2011-10-13 02:16:59 +0000 +++ configure.in 2011-10-18 18:12:53 +0000 @@ -1925,8 +1925,8 @@ if test "$pkg_check_gtk" != "yes"; then HAVE_GTK=no if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.6 - GTK_REQUIRED=2.6 + GLIB_REQUIRED=2.10 + GTK_REQUIRED=2.10 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" dnl Checks for libraries. ------------------------------------------------------------ revno: 106124 fixes bug(s): http://debbugs.gnu.org/9771 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2011-10-18 18:56:09 +0200 message: Fix bug #9771 with slow redisplay in long lines full of control characters. src/bidi.c (bidi_line_init): Initialize next_en_pos to zero, not -1. (bidi_resolve_neutral): Don't enter the expensive loop looking for non-neutral characters if the current character is a paragraph separator (a.k.a. Newline). This avoids running the same expensive loop twice, once when we consume the preceding newline and the other time when the line actually needs to be displayed. Avoid the loop when we see neutrals on the base embedding level following a character whose directionality is the same as the paragraph's. This avoids running the expensive loop when a line ends in a long sequence of neutrals, like control characters. Add assertion against STRONG_AL type. Slightly rearrange code that determines the type of a neutral given the first non-neutral that follows it. (bidi_level_of_next_char): Set next_en_pos to zero when invalidating its info. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-17 19:13:44 +0000 +++ src/ChangeLog 2011-10-18 16:56:09 +0000 @@ -1,3 +1,22 @@ +2011-10-18 Eli Zaretskii + + Fix part 3 of bug#9771. + * bidi.c (bidi_line_init): Initialize next_en_pos to zero, not -1. + (bidi_resolve_neutral): Don't enter the expensive loop looking for + non-neutral characters if the current character is a paragraph + separator (a.k.a. Newline). This avoids running the same + expensive loop twice, once when we consume the preceding newline + and the other time when the line actually needs to be displayed. + Avoid the loop when we see neutrals on the base embedding level + following a character whose directionality is the same as the + paragraph's. This avoids running the expensive loop when a line + ends in a long sequence of neutrals, like control characters. + Add assertion against STRONG_AL type. Slightly rearrange code + that determines the type of a neutral given the first non-neutral + that follows it. + (bidi_level_of_next_char): Set next_en_pos to zero when + invalidating its info. + 2011-10-17 Eli Zaretskii * xdisp.c (push_display_prop): Determine whether to record string === modified file 'src/bidi.c' --- src/bidi.c 2011-10-13 11:17:32 +0000 +++ src/bidi.c 2011-10-18 16:56:09 +0000 @@ -846,7 +846,9 @@ bidi_it->level_stack[0].override = NEUTRAL_DIR; /* X1 */ bidi_it->invalid_levels = 0; bidi_it->invalid_rl_levels = -1; - bidi_it->next_en_pos = -1; + /* Setting this to zero will force its recomputation the first time + we need it for W5. */ + bidi_it->next_en_pos = 0; bidi_it->next_for_ws.type = UNKNOWN_BT; bidi_set_sor_type (bidi_it, (bidi_it->paragraph_dir == R2L ? 1 : 0), @@ -1732,7 +1734,7 @@ if (bidi_it->prev.type_after_w1 == WEAK_EN /* ET/BN w/EN before it */ || bidi_it->next_en_pos > bidi_it->charpos) type = WEAK_EN; - else /* W5: ET/BN with EN after it. */ + else if (bidi_it->next_en_pos >=0) /* W5: ET/BN with EN after it. */ { EMACS_INT en_pos = bidi_it->charpos + bidi_it->nchars; const unsigned char *s = (STRINGP (bidi_it->string.lstring) @@ -1775,6 +1777,11 @@ else if (type == WEAK_BN) type = NEUTRAL_ON; /* W6/Retaining */ } + else if (type_of_next == NEUTRAL_B) + /* Record the fact that there are no more ENs from + here to the end of paragraph, to avoid entering the + loop above ever again in this paragraph. */ + bidi_it->next_en_pos = -1; } } } @@ -1843,13 +1850,45 @@ || type == NEUTRAL_ON)) abort (); - if (bidi_get_category (type) == NEUTRAL + if ((type != NEUTRAL_B /* Don't risk entering the long loop below if + we are already at paragraph end. */ + && bidi_get_category (type) == NEUTRAL) || (type == WEAK_BN && prev_level == current_level)) { if (bidi_it->next_for_neutral.type != UNKNOWN_BT) type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type, bidi_it->next_for_neutral.type, current_level); + /* The next two "else if" clauses are shortcuts for the + important special case when we have a long sequence of + neutral or WEAK_BN characters, such as whitespace or nulls or + other control characters, on the base embedding level of the + paragraph, and that sequence goes all the way to the end of + the paragraph and follows a character whose resolved + directionality is identical to the base embedding level. + (This is what happens in a buffer with plain L2R text that + happens to include long sequences of control characters.) By + virtue of N1, the result of examining this long sequence will + always be either STRONG_L or STRONG_R, depending on the base + embedding level. So we use this fact directly instead of + entering the expensive loop in the "else" clause. */ + else if (current_level == 0 + && bidi_it->prev_for_neutral.type == STRONG_L + && !bidi_explicit_dir_char (bidi_it->ch)) + type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type, + STRONG_L, current_level); + else if (/* current level is 1 */ + current_level == 1 + /* base embedding level is also 1 */ + && bidi_it->level_stack[0].level == 1 + /* previous character is one of those considered R for + the purposes of W5 */ + && (bidi_it->prev_for_neutral.type == STRONG_R + || bidi_it->prev_for_neutral.type == WEAK_EN + || bidi_it->prev_for_neutral.type == WEAK_AN) + && !bidi_explicit_dir_char (bidi_it->ch)) + type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type, + STRONG_R, current_level); else { /* Arrrgh!! The UAX#9 algorithm is too deeply entrenched in @@ -1900,6 +1939,9 @@ case STRONG_L: case STRONG_R: case STRONG_AL: + /* Actually, STRONG_AL cannot happen here, because + bidi_resolve_weak converts it to STRONG_R, per W3. */ + xassert (type != STRONG_AL); next_type = type; break; case WEAK_EN: @@ -1907,7 +1949,6 @@ /* N1: ``European and Arabic numbers are treated as though they were R.'' */ next_type = STRONG_R; - saved_it.next_for_neutral.type = STRONG_R; break; case WEAK_BN: if (!bidi_explicit_dir_char (bidi_it->ch)) @@ -1920,11 +1961,7 @@ member. */ if (saved_it.type != WEAK_BN || bidi_get_category (bidi_it->prev.type_after_w1) == NEUTRAL) - { - next_type = bidi_it->prev_for_neutral.type; - saved_it.next_for_neutral.type = next_type; - bidi_check_type (next_type); - } + next_type = bidi_it->prev_for_neutral.type; else { /* This is a BN which does not adjoin neutrals. @@ -1938,7 +1975,9 @@ } type = bidi_resolve_neutral_1 (saved_it.prev_for_neutral.type, next_type, current_level); + saved_it.next_for_neutral.type = next_type; saved_it.type = type; + bidi_check_type (next_type); bidi_check_type (type); bidi_copy_it (bidi_it, &saved_it); } @@ -2014,7 +2053,7 @@ bidi_it->next_for_neutral.type = UNKNOWN_BT; if (bidi_it->next_en_pos >= 0 && bidi_it->charpos >= bidi_it->next_en_pos) - bidi_it->next_en_pos = -1; + bidi_it->next_en_pos = 0; if (bidi_it->next_for_ws.type != UNKNOWN_BT && bidi_it->charpos >= bidi_it->next_for_ws.charpos) bidi_it->next_for_ws.type = UNKNOWN_BT; ------------------------------------------------------------ revno: 106123 committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-10-18 08:55:20 -0700 message: 2 GiB, not 4 GiB, for buffer sizes. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-10-18 15:34:06 +0000 +++ etc/NEWS 2011-10-18 15:55:20 +0000 @@ -51,8 +51,8 @@ --- ** There is a new configure option --with-wide-int. With it, Emacs integers typically have 62 bits, even on 32-bit machines. -On 32-bit hosts, this raises the limit on buffer sizes from 512 MiB to -a bit less than 4 GiB, with the exact limit set by the operating system. +On 32-bit hosts, this raises the limit on buffer sizes from about 512 MiB +to about 2 GiB. --- ** New translation of the Emacs Tutorial in Hebrew is available. ------------------------------------------------------------ revno: 106122 committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-10-18 08:34:06 -0700 message: Mention buffer size limit --with-wide-int on 32-bit hosts. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-10-18 06:52:32 +0000 +++ etc/NEWS 2011-10-18 15:34:06 +0000 @@ -51,6 +51,8 @@ --- ** There is a new configure option --with-wide-int. With it, Emacs integers typically have 62 bits, even on 32-bit machines. +On 32-bit hosts, this raises the limit on buffer sizes from 512 MiB to +a bit less than 4 GiB, with the exact limit set by the operating system. --- ** New translation of the Emacs Tutorial in Hebrew is available. ------------------------------------------------------------ revno: 106121 fixes bug(s): http://debbugs.gnu.org/9722 committer: Juanma Barranquero branch nick: trunk timestamp: Tue 2011-10-18 16:31:27 +0200 message: lisp/facemenu.el (list-colors-duplicates): Detect more duplicates on Windows. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-18 13:38:09 +0000 +++ lisp/ChangeLog 2011-10-18 14:31:27 +0000 @@ -1,3 +1,9 @@ +2011-10-18 Juanma Barranquero + + * facemenu.el (list-colors-duplicates): On Windows, detect more + duplicates by assuming that only colors matching "^System" are + special "system colors". (Bug#9722) + 2011-10-18 Stefan Monnier * vc/log-edit.el (log-edit): Add "Author:" header to encourage people @@ -26,7 +32,7 @@ * font-lock.el (font-lock-maximum-size): Mark as obsolete. -2011-10-17 Ryan Barrett (tiny change) +2011-10-17 Ryan Barrett (tiny change) * dirtrack.el (dirtrack): Support shell buffers with path prefixes, e.g. tramp-based remote shells. (Bug#9647) @@ -465,8 +471,8 @@ * net/newst-reader.el (newsticker-html-renderer) (newsticker-show-news): Automatically - load html rendering package if newsticker-html-renderer is - set. Fixes "Warning: defvar ignored because w3m-fill-column is + load html rendering package if newsticker-html-renderer is set. + Fixes "Warning: defvar ignored because w3m-fill-column is let-bound" and the error "Symbol's value as variable is void: w3m-fill-column". === modified file 'lisp/facemenu.el' --- lisp/facemenu.el 2011-09-11 01:55:09 +0000 +++ lisp/facemenu.el 2011-10-18 14:31:27 +0000 @@ -639,8 +639,15 @@ (l list)) (while (cdr l) (if (and (facemenu-color-equal (car (car l)) (car (car (cdr l)))) - (not (if (fboundp 'w32-default-color-map) - (not (assoc (car (car l)) (w32-default-color-map)))))) + ;; On MS-Windows, there are logical colors that might have + ;; the same value but different names and meanings. For + ;; example, `SystemMenuText' (the color w32 uses for the + ;; text in menu entries) and `SystemWindowText' (the default + ;; color w32 uses for the text in windows and dialogs) may + ;; be the same display color and be adjacent in the list. + ;; This makes them different to any other color. Bug#9722 + (not (and (eq system-type 'windows-nt) + (string-match-p "^System" (car (car l)))))) (progn (setcdr (car l) (cons (car (car (cdr l))) (cdr (car l)))) (setcdr l (cdr (cdr l)))) ------------------------------------------------------------ revno: 106120 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-10-18 14:10:52 +0000 message: Merge changes made in Gnus trunk. gnus-util.el (gnus-bound-and-true-p): Macro for XEmacs compatibility. nnir.el (nnir-mode): Use it. nnmairix.el (nnmairix-determine-original-group-from-registry): Use it. nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy. nnmairix.el (gnus-registry-enabled): Ditto. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-18 08:12:19 +0000 +++ lisp/gnus/ChangeLog 2011-10-18 14:10:52 +0000 @@ -1,3 +1,13 @@ +2011-10-18 Teodor Zlatanov + + * gnus-util.el (gnus-bound-and-true-p): Macro for XEmacs compatibility. + * nnir.el (nnir-mode): Use it. + * nnmairix.el (nnmairix-determine-original-group-from-registry): + Use it. + + * nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy. + * nnmairix.el (gnus-registry-enabled): Ditto. + 2011-10-17 Teodor Zlatanov * gnus-registry.el (gnus-registry-enabled): Add new variable. === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2011-09-11 16:12:42 +0000 +++ lisp/gnus/gnus-util.el 2011-10-18 14:10:52 +0000 @@ -1986,6 +1986,14 @@ (gnus-macroexpand-all expanded environment))) form)))) +(eval-when-compile + ;; This is unnecessary in the compiled version as it is a macro. + (if (fboundp 'bound-and-true-p) + (defalias 'gnus-bound-and-true-p 'bound-and-true-p) + (defmacro gnus-bound-and-true-p (var) + "Return the value of symbol VAR if it is bound, else nil." + `(and (boundp (quote ,var)) ,var)))) + (provide 'gnus-util) ;;; gnus-util.el ends here === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-10-17 22:51:37 +0000 +++ lisp/gnus/nnir.el 2011-10-18 14:10:52 +0000 @@ -292,6 +292,8 @@ (autoload 'nnimap-make-thread-query "nnimap") (autoload 'gnus-registry-action "gnus-registry")) +;; Suppress byte-compiler warning `reference to free variable' +(defvar gnus-registry-enabled) (nnoo-declare nnir) (nnoo-define-basics nnir) @@ -1740,7 +1742,7 @@ (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir) (setq gnus-summary-line-format (or nnir-summary-line-format gnus-summary-line-format)) - (when (bound-and-true-p gnus-registry-enabled) + (when (gnus-bound-and-true-p gnus-registry-enabled) (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t) === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2011-10-17 22:51:37 +0000 +++ lisp/gnus/nnmairix.el 2011-10-18 14:10:52 +0000 @@ -605,6 +605,9 @@ ;; Silence byte-compiler. (autoload 'gnus-registry-get-id-key "gnus-registry") +;; Suppress byte-compiler warning `reference to free variable' +(defvar gnus-registry-enabled) + (deffoo nnmairix-request-set-mark (group actions &optional server) (when server (nnmairix-open-server server)) @@ -1635,7 +1638,7 @@ (defun nnmairix-determine-original-group-from-registry (mid) "Try to determinale original group for message-id MID from the registry." - (when (bound-and-true-p gnus-registry-enabled) + (when (gnus-bound-and-true-p gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) (unless (string-match ">$" mid) ------------------------------------------------------------ revno: 106119 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2011-10-18 09:38:09 -0400 message: * lisp/vc/log-edit.el (log-edit): Add "Author:" header to encourage people to distinguish the author from the committer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-18 09:58:06 +0000 +++ lisp/ChangeLog 2011-10-18 13:38:09 +0000 @@ -1,3 +1,8 @@ +2011-10-18 Stefan Monnier + + * vc/log-edit.el (log-edit): Add "Author:" header to encourage people + to distinguish the author from the committer. + 2011-10-18 Michael Albinus * net/tramp.el (tramp-file-name-handler): Load Tramp packages silently. === modified file 'lisp/vc/log-edit.el' --- lisp/vc/log-edit.el 2011-04-08 03:21:30 +0000 +++ lisp/vc/log-edit.el 2011-10-18 13:38:09 +0000 @@ -386,7 +386,7 @@ (setq setup (not setup))) (when setup (erase-buffer) - (insert "Summary: ") + (insert "Summary: \nAuthor: ") (save-excursion (insert "\n\n"))) (if mode (funcall mode) ------------------------------------------------------------ revno: 106118 committer: Michael Albinus branch nick: trunk timestamp: Tue 2011-10-18 11:58:06 +0200 message: * net/tramp.el (tramp-file-name-handler): Load Tramp packages silently. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-18 08:02:47 +0000 +++ lisp/ChangeLog 2011-10-18 09:58:06 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Michael Albinus + + * net/tramp.el (tramp-file-name-handler): Load Tramp packages silently. + 2011-10-18 Jirka Kosek (tiny change) * international/mule.el (sgml-html-meta-auto-coding-function): === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2011-10-12 18:32:35 +0000 +++ lisp/net/tramp.el 2011-10-18 09:58:06 +0000 @@ -1886,7 +1886,7 @@ (when (and (listp sf) (eq (car sf) 'autoload)) (let ((default-directory (tramp-compat-temporary-file-directory))) - (load (cadr sf) 'noerror))) + (load (cadr sf) 'noerror 'nomessage))) (apply foreign operation args)) ;; Trace that somebody has interrupted the operation.