commit 247e0411a3131c6b6d83ff42c59aafb9ed686c04 (HEAD, refs/remotes/origin/master) Author: Lars Ingebrigtsen Date: Sat Apr 30 02:37:26 2016 +0200 No need to test for jka-compr * lisp/vc/ediff-util.el (ediff-file-compressed-p): jka-compr is always available; no need to test (bug#18204). diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index eb5c249..c12602c 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -1141,11 +1141,8 @@ of the current buffer." )) (defun ediff-file-compressed-p (file) - (condition-case nil - (require 'jka-compr) - (error)) - (if (featurep 'jka-compr) - (string-match (jka-compr-build-file-regexp) file))) + (require 'jka-compr) + (string-match (jka-compr-build-file-regexp) file)) (defun ediff-swap-buffers () commit a10eb168cc96db9f0dab2d75550cbd8f08be2363 Author: Lars Ingebrigtsen Date: Sat Apr 30 02:03:24 2016 +0200 Doc fixed for next-error-buffer-p * lisp/simple.el (next-error-buffer-p): Clarify doc string (bug#18202). diff --git a/lisp/simple.el b/lisp/simple.el index cb4ddc6..849cbd6 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -145,18 +145,18 @@ nil means use goto-char using the second argument position.") &optional avoid-current extra-test-inclusive extra-test-exclusive) - "Test if BUFFER is a `next-error' capable buffer. - -If AVOID-CURRENT is non-nil, treat the current buffer -as an absolute last resort only. - -The function EXTRA-TEST-INCLUSIVE, if non-nil, is called in each buffer -that normally would not qualify. If it returns t, the buffer -in question is treated as usable. - -The function EXTRA-TEST-EXCLUSIVE, if non-nil, is called in each buffer -that would normally be considered usable. If it returns nil, -that buffer is rejected." + "Return non-nil if BUFFER is a `next-error' capable buffer. +If AVOID-CURRENT is non-nil, and BUFFER is the current buffer, +return nil. + +The function EXTRA-TEST-INCLUSIVE, if non-nil, is called if +BUFFER would not normally qualify. If it returns non-nil, BUFFER +is considered `next-error' capable, anyway, and the function +returns non-nil. + +The function EXTRA-TEST-EXCLUSIVE, if non-nil, is called if the +buffer would normally qualify. If it returns nil, BUFFER is +rejected, and the function returns nil." (and (buffer-name buffer) ;First make sure it's live. (not (and avoid-current (eq buffer (current-buffer)))) (with-current-buffer buffer commit 2ef0040e2363a669d9b93df935d31c98fa130132 Author: Lars Ingebrigtsen Date: Sat Apr 30 01:26:17 2016 +0200 Tiny doc fix * src/fileio.c (Ffile_accessible_directory_p): Tiny doc fix (and fill) (bug#18201). diff --git a/src/fileio.c b/src/fileio.c index 78cc66d..d931808 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -2662,13 +2662,13 @@ file_directory_p (char const *file) DEFUN ("file-accessible-directory-p", Ffile_accessible_directory_p, Sfile_accessible_directory_p, 1, 1, 0, - doc: /* Return t if file FILENAME names a directory you can open. -For the value to be t, FILENAME must specify the name of a directory as a file, -and the directory must allow you to open files in it. In order to use a -directory as a buffer's current directory, this predicate must return true. -A directory name spec may be given instead; then the value is t -if the directory so specified exists and really is a readable and -searchable directory. */) + doc: /* Return t if FILENAME names a directory you can open. +For the value to be t, FILENAME must specify the name of a directory +as a file, and the directory must allow you to open files in it. In +order to use a directory as a buffer's current directory, this +predicate must return true. A directory name spec may be given +instead; then the value is t if the directory so specified exists and +really is a readable and searchable directory. */) (Lisp_Object filename) { Lisp_Object absname; commit 6b769c81d024f7eeb90b167e7df6f87d859614d4 Author: Lars Ingebrigtsen Date: Sat Apr 30 00:54:13 2016 +0200 Doc fix * src/keymap.c (Fdefine_prefix_command): Clarify doc string slightly (bug#18092). diff --git a/src/keymap.c b/src/keymap.c index eef1dcd..44335ad 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1737,10 +1737,12 @@ bindings; see the description of `lookup-key' for more details about this. */) DEFUN ("define-prefix-command", Fdefine_prefix_command, Sdefine_prefix_command, 1, 3, 0, doc: /* Define COMMAND as a prefix command. COMMAND should be a symbol. -A new sparse keymap is stored as COMMAND's function definition and its value. -If a second optional argument MAPVAR is given, the map is stored as -its value instead of as COMMAND's value; but COMMAND is still defined -as a function. +A new sparse keymap is stored as COMMAND's function definition and its +value. +This prepares COMMAND for use as a prefix key's binding. +If a second optional argument MAPVAR is given, it should be a symbol. +The map is then stored as MAPVAR's value instead of as COMMAND's +value; but COMMAND is still defined as a function. The third optional argument NAME, if given, supplies a menu name string for the map. This is required to use the keymap as a menu. This function returns COMMAND. */) commit d7a5b5be9a5869bcd233434ec3103dd1976d7df7 Author: Lars Ingebrigtsen Date: Sat Apr 30 00:37:31 2016 +0200 delsel doc touch ups * lisp/delsel.el (delete-selection-helper): Use non-nil instead of t and clarify function return values (bug#18089). diff --git a/lisp/delsel.el b/lisp/delsel.el index 6a819eb..da4223f 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -171,16 +171,17 @@ With ARG, repeat that many times. `C-u' means until end of buffer." active region. `kill' `kill-region' is used on the selection, rather than - `delete-region'. (Text selected with the mouse will typically - be yankable anyhow.) - t - The normal case: delete the active region prior to executing - the command which will insert replacement text. + `delete-region'. (Text selected with the mouse will + typically be yankable anyhow.) FUNCTION - For commands which need to dynamically determine this behavior. - FUNCTION should take no argument and return one of the above - values, or nil. In the latter case, FUNCTION should itself - do with the active region whatever is appropriate." + For commands which need to dynamically determine this + behavior. FUNCTION should take no argument and return a + value acceptable as TYPE, or nil. In the latter case, + FUNCTION should itself do with the active region whatever is + appropriate. + Other non-nil values + The normal case: delete the active region prior to executing + the command which will insert replacement text." (condition-case data (cond ((eq type 'kill) ;Deprecated, backward compatibility. (delete-active-region t) commit 33d2c67bff0992ecbc0fe38556683242b9d1a4ae Author: Lars Ingebrigtsen Date: Sat Apr 30 00:11:15 2016 +0200 Doc fixes for menu-bar.el * lisp/menu-bar.el (clipboard-kill-ring-save): Describe the REGION parameter (bug#18028). (clipboard-kill-region): Ditto. diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 82d8fad..933e2d2 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -541,7 +541,9 @@ (yank))) (defun clipboard-kill-ring-save (beg end &optional region) - "Copy region to kill ring, and save in the GUI's clipboard." + "Copy region to kill ring, and save in the GUI's clipboard. +If the optional argument REGION is non-nil, the function ignores +BEG and END, and saves the current region instead." (interactive "r\np") (let ((gui-select-enable-clipboard t) (interprogram-cut-function (or interprogram-cut-function @@ -549,7 +551,9 @@ (kill-ring-save beg end region))) (defun clipboard-kill-region (beg end &optional region) - "Kill the region, and save it in the GUI's clipboard." + "Kill the region, and save it in the GUI's clipboard. +If the optional argument REGION is non-nil, the function ignores +BEG and END, and kills the current region instead." (interactive "r\np") (let ((gui-select-enable-clipboard t) (interprogram-cut-function (or interprogram-cut-function commit 6baca4911ec901579749dbf7596011d90fea3781 Author: Lars Ingebrigtsen Date: Sat Apr 30 00:08:07 2016 +0200 Doc fix * lisp/rect.el (delete-whitespace-rectangle): Doc fix (bug#18026). diff --git a/lisp/rect.el b/lisp/rect.el index 07e0f6f..53fe467 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -370,7 +370,7 @@ no text on the right side of the rectangle." "Delete all whitespace following a specified column in each line. The left edge of the rectangle specifies the position in each line at which whitespace deletion should begin. On each line in the -rectangle, all continuous whitespace starting at that column is deleted. +rectangle, all contiguous whitespace starting at that column is deleted. When called from a program the rectangle's corners are START and END. With a prefix (or a FILL) argument, also fill too short lines." commit 5d1f3192d484edee92caa46cd7d699da3e920259 Author: Lars Ingebrigtsen Date: Sat Apr 30 00:02:46 2016 +0200 Minor doc clarification * lisp/subr.el (y-or-n-p): Document the return value from "n" (bug#18024). diff --git a/lisp/subr.el b/lisp/subr.el index 6cc2585..5477500 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2478,7 +2478,8 @@ floating point support." (declare-function x-popup-dialog "menu.c" (position contents &optional header)) (defun y-or-n-p (prompt) - "Ask user a \"y or n\" question. Return t if answer is \"y\". + "Ask user a \"y or n\" question. +Return t if answer is \"y\" and nil if it is \"n\". PROMPT is the string to display to ask the question. It should end in a space; `y-or-n-p' adds \"(y or n) \" to it. commit 27abf372836532c57be2e9e3ed23413729cc07fc Author: Lars Ingebrigtsen Date: Fri Apr 29 23:53:12 2016 +0200 Fill font-lock-mode doc string * lisp/font-core.el (font-lock-mode): Fill the text to make it narrower (bug#18008). diff --git a/lisp/font-core.el b/lisp/font-core.el index a0971a1..b3da897 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -86,46 +86,50 @@ When Font Lock mode is enabled, text is fontified as you type it: - Comments are displayed in `font-lock-comment-face'; - Strings are displayed in `font-lock-string-face'; - - Certain other expressions are displayed in other faces according to the - value of the variable `font-lock-keywords'. + - Certain other expressions are displayed in other faces + according to the value of the variable `font-lock-keywords'. To customize the faces (colors, fonts, etc.) used by Font Lock for fontifying different parts of buffer text, use \\[customize-face]. -You can enable Font Lock mode in any major mode automatically by turning on in -the major mode's hook. For example, put in your ~/.emacs: +You can enable Font Lock mode in any major mode automatically by +turning on in the major mode's hook. For example, put in your +~/.emacs: (add-hook \\='c-mode-hook \\='turn-on-font-lock) -Alternatively, you can use Global Font Lock mode to automagically turn on Font -Lock mode in buffers whose major mode supports it and whose major mode is one -of `font-lock-global-modes'. For example, put in your ~/.emacs: +Alternatively, you can use Global Font Lock mode to automagically +turn on Font Lock mode in buffers whose major mode supports it +and whose major mode is one of `font-lock-global-modes'. For +example, put in your ~/.emacs: (global-font-lock-mode t) -Where major modes support different levels of fontification, you can use -the variable `font-lock-maximum-decoration' to specify which level you -generally prefer. When you turn Font Lock mode on/off the buffer is -fontified/defontified, though fontification occurs only if the buffer is -less than `font-lock-maximum-size'. +Where major modes support different levels of fontification, you +can use the variable `font-lock-maximum-decoration' to specify +which level you generally prefer. When you turn Font Lock mode +on/off the buffer is fontified/defontified, though fontification +occurs only if the buffer is less than `font-lock-maximum-size'. -To add your own highlighting for some major mode, and modify the highlighting -selected automatically via the variable `font-lock-maximum-decoration', you can -use `font-lock-add-keywords'. +To add your own highlighting for some major mode, and modify the +highlighting selected automatically via the variable +`font-lock-maximum-decoration', you can use +`font-lock-add-keywords'. -To fontify a buffer, without turning on Font Lock mode and regardless of buffer -size, you can use \\[font-lock-fontify-buffer]. +To fontify a buffer, without turning on Font Lock mode and +regardless of buffer size, you can use \\[font-lock-fontify-buffer]. -To fontify a block (the function or paragraph containing point, or a number of -lines around point), perhaps because modification on the current line caused -syntactic change on other lines, you can use \\[font-lock-fontify-block]. +To fontify a block (the function or paragraph containing point, +or a number of lines around point), perhaps because modification +on the current line caused syntactic change on other lines, you +can use \\[font-lock-fontify-block]. You can set your own default settings for some mode, by setting a buffer local value for `font-lock-defaults', via its mode hook. -The above is the default behavior of `font-lock-mode'; you may specify -your own function which is called when `font-lock-mode' is toggled via -`font-lock-function'. " +The above is the default behavior of `font-lock-mode'; you may +specify your own function which is called when `font-lock-mode' +is toggled via `font-lock-function'. " nil nil nil :after-hook (font-lock-initial-fontify) ;; Don't turn on Font Lock mode if we don't have a display (we're running a commit 323b69664914d687fd4b48593479cea223dfbcb4 Author: Lars Ingebrigtsen Date: Fri Apr 29 23:25:07 2016 +0200 Wrap the auto-generated doc string * lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Wrap a string to make it less likely that we get overlong lines (bug#17999). diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 46d5d0d..38295c3 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -253,7 +253,8 @@ Use the command `%s' to change this variable." pretty-name mode)) (t (let ((base-doc-string (concat "Non-nil if %s is enabled. -See the command `%s' for a description of this minor mode." +See the `%s' command +for a description of this minor mode." (if body " Setting this variable directly does not take effect; either customize it (see the info node `Easy Customization') commit 552e90ce7dff3a7107243fdf71c4de3af443e13a Author: Lars Ingebrigtsen Date: Fri Apr 29 22:53:42 2016 +0200 Clarify hi-lock-find-patterns * lisp/hi-lock.el (hi-lock-find-patterns): Doc clarification (bug#17989). diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index ec14e0b..549010d 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -727,7 +727,7 @@ with completion and history." (font-lock-flush))) (defun hi-lock-find-patterns () - "Find patterns in current buffer for hi-lock." + "Add patterns from the current buffer to the list of hi-lock patterns." (interactive) (unless (memq major-mode hi-lock-exclude-modes) (let ((all-patterns nil) commit 8f3a6de5e240910845594e079b2734a1acc1c25c Author: Lars Ingebrigtsen Date: Fri Apr 29 22:44:13 2016 +0200 Warning fix in jit-lock-mode * lisp/jit-lock.el (jit-lock-mode): Don't issue a warning when turning the mode on in an indirect buffer, if this somehow has happened (bug#17738). diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el index 810c220..c49fa6e 100644 --- a/lisp/jit-lock.el +++ b/lisp/jit-lock.el @@ -195,9 +195,11 @@ the variable `jit-lock-stealth-nice'. If you need to debug code run from jit-lock, see `jit-lock-debug-mode'." (setq jit-lock-mode arg) (cond - ((buffer-base-buffer) - ;; We're in an indirect buffer. This doesn't work because jit-lock relies - ;; on the `fontified' text-property which is shared with the base buffer. + ((and (buffer-base-buffer) + jit-lock-mode) + ;; We're in an indirect buffer, and we're turning the mode on. + ;; This doesn't work because jit-lock relies on the `fontified' + ;; text-property which is shared with the base buffer. (setq jit-lock-mode nil) (message "Not enabling jit-lock: it does not work in indirect buffer")) commit 2c3ab9b6e39a3d600e7d82deacc24effaec051bb Author: Lars Ingebrigtsen Date: Fri Apr 29 22:28:02 2016 +0200 Add a doc string to `winner-mode' * lisp/winner.el (winner-mode): Add a doc string based on the comments in the file (bug#17716). diff --git a/lisp/winner.el b/lisp/winner.el index 4b27700..9a6f5d5 100644 --- a/lisp/winner.el +++ b/lisp/winner.el @@ -346,7 +346,19 @@ You may want to include buffer names such as *Help*, *Apropos*, ;;;###autoload -(define-minor-mode winner-mode nil :global t ; let d-m-m make the doc +(define-minor-mode winner-mode + "Toggle Winner mode on or off. +With a prefix argument ARG, enable Winner mode if ARG is +positive, and disable it otherwise. If called from Lisp, enable +the mode if ARG is omitted or nil, and toggle it if ARG is ‘toggle’. + +Winner mode is a global minor mode that records the changes in +the window configuration (i.e. how the frames are partitioned +into windows) so that the changes can be \"undone\" using the +command `winner-undo'. By default this one is bound to the key +sequence `C-c '. If you change your mind (while undoing), +you can press `C-c ' (calling `winner-redo')." + :global t (if winner-mode (progn (add-hook 'window-configuration-change-hook 'winner-change-fun) commit 340a224ec3e01706112a07164da9a9f3f369a5aa Author: Lars Ingebrigtsen Date: Fri Apr 29 22:14:05 2016 +0200 Doc fix for align-newline-and-indent * lisp/align.el (align-newline-and-indent): Mention that alignment is done by `align' (bug#17707). diff --git a/lisp/align.el b/lisp/align.el index 41519a5..866aaad 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -1054,7 +1054,9 @@ to be colored." ;;;###autoload (defun align-newline-and-indent () - "A replacement function for `newline-and-indent', aligning as it goes." + "A replacement function for `newline-and-indent', aligning as it goes. +The alignment is done by calling `align' on the region that was +indented." (interactive) (let ((separate (or (if (and (symbolp align-region-separate) (boundp align-region-separate)) commit b9d69380a110a86076b4f5b66c7ecdcb790d822d Author: Lars Ingebrigtsen Date: Fri Apr 29 22:06:37 2016 +0200 Cancel the eldoc timer when switching off eldoc mode * lisp/emacs-lisp/eldoc.el (eldoc-mode): Cancel the eldoc timer when switching off eldoc mode. It will be restarted again if needed (bug#17582). diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index d5e7178..bc5a78b 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -197,7 +197,10 @@ expression point is on." (t (kill-local-variable 'eldoc-message-commands) (remove-hook 'post-command-hook 'eldoc-schedule-timer t) - (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t)))) + (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t) + (when eldoc-timer + (cancel-timer eldoc-timer) + (setq eldoc-timer nil))))) ;;;###autoload (define-minor-mode global-eldoc-mode commit 3a33afe25d8518f194fa4706eaccdb2a786a0348 Author: Lars Ingebrigtsen Date: Fri Apr 29 20:27:22 2016 +0200 Doc fix for `kbd' * lisp/subr.el (kbd): Describe more fully the format of the parameter (bug#17039). diff --git a/lisp/subr.el b/lisp/subr.el index 2dfd96e..6cc2585 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -620,8 +620,10 @@ side-effects, and the argument LIST is not modified." (defun kbd (keys) "Convert KEYS to the internal Emacs key representation. -KEYS should be a string constant in the format used for -saving keyboard macros (see `edmacro-mode')." +KEYS should be a string in the format returned by commands such +as `C-h k' (`describe-key'). +This is the same format used for saving keyboard macros (see +`edmacro-mode')." ;; Don't use a defalias, since the `pure' property is only true for ;; the calling convention of `kbd'. (read-kbd-macro keys)) commit aa112ebab77a14cae6010f5a926eae668c4f9d87 Author: Glenn Morris Date: Fri Apr 29 13:31:45 2016 -0400 ; Comment tweak. diff --git a/test/lisp/erc/erc-track-tests.el b/test/lisp/erc/erc-track-tests.el index 2e60b0d..24dfcfb 100644 --- a/test/lisp/erc/erc-track-tests.el +++ b/test/lisp/erc/erc-track-tests.el @@ -1,6 +1,6 @@ ;;; erc-track-tests.el --- Tests for erc-track. -;; Copyright © 2016 Free Software Foundation, Inc. +;; Copyright (C) 2016 Free Software Foundation, Inc. ;; Author: Mario Lang ;; Author: Vivek Dasmohapatra commit 1a3a1f709d43836772bc0a84fa67694ff8123df5 Author: Lars Ingebrigtsen Date: Fri Apr 29 18:22:58 2016 +0200 Add a sanity check to apropos-documentation-internal * lisp/apropos.el (apropos-documentation-internal): Add a sanity check to be less fragile in the presence of invalid data (bug#16725). diff --git a/lisp/apropos.el b/lisp/apropos.el index eb145bd..6009f30 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -867,19 +867,23 @@ Returns list of symbols and documentation found." symbol))))) (defun apropos-documentation-internal (doc) - (if (consp doc) - (apropos-documentation-check-elc-file (car doc)) - (if (and doc - (string-match apropos-all-words-regexp doc) - (apropos-true-hit-doc doc)) - (when apropos-match-face - (setq doc (substitute-command-keys (copy-sequence doc))) - (if (or (string-match apropos-pattern-quoted doc) - (string-match apropos-all-words-regexp doc)) - (put-text-property (match-beginning 0) - (match-end 0) - 'face apropos-match-face doc)) - doc)))) + (cond + ((consp doc) + (apropos-documentation-check-elc-file (car doc))) + ((and doc + ;; Sanity check in case bad data has snuck into the + ;; documentation slot. + (stringp doc) + (string-match apropos-all-words-regexp doc) + (apropos-true-hit-doc doc)) + (when apropos-match-face + (setq doc (substitute-command-keys (copy-sequence doc))) + (if (or (string-match apropos-pattern-quoted doc) + (string-match apropos-all-words-regexp doc)) + (put-text-property (match-beginning 0) + (match-end 0) + 'face apropos-match-face doc)) + doc)))) (defun apropos-format-plist (pl sep &optional compare) (setq pl (symbol-plist pl)) commit 35fb7897f161d5e5a87e039dc1e427094640b0c8 Author: Lars Ingebrigtsen Date: Fri Apr 29 17:54:55 2016 +0200 Doc tweak * lisp/simple.el (use-empty-active-region): Doc tweak. There's only one region (bug#16513). diff --git a/lisp/simple.el b/lisp/simple.el index 595eba3..cb4ddc6 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5218,7 +5218,7 @@ This macro does what `save-excursion' did before Emacs 25.1." (defcustom use-empty-active-region nil "Whether \"region-aware\" commands should act on empty regions. -If nil, region-aware commands treat empty regions as inactive. +If nil, region-aware commands treat the empty region as inactive. If non-nil, region-aware commands treat the region as active as long as the mark is active, even if the region is empty. commit b01dac19fba2e018100051c7b80b633727db555e Author: Lars Ingebrigtsen Date: Fri Apr 29 17:38:26 2016 +0200 Clarify `read-face-name' doc and tweak the code * lisp/faces.el (read-face-name): Clarify the documentation and allow a mix of faces and faces names in all cases (bug#16483). diff --git a/lisp/faces.el b/lisp/faces.el index 1b97093..1ceba48 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -979,25 +979,31 @@ of the default face. Value is FACE." "Read one or more face names, prompting with PROMPT. PROMPT should not end in a space or a colon. -Return DEFAULT if the user enters the empty string. -If DEFAULT is non-nil, it should be a single face or a list of face names -\(symbols or strings). In the latter case, return the `car' of DEFAULT -\(if MULTIPLE is nil, see below), or DEFAULT (if MULTIPLE is non-nil). - -If MULTIPLE is non-nil, this function uses `completing-read-multiple' -to read multiple faces with \"[ \\t]*,[ \\t]*\" as the separator regexp -and it returns a list of face names. Otherwise, it reads and returns -a single face name." - (if (and default (not (stringp default))) - (setq default - (cond ((symbolp default) - (symbol-name default)) - (multiple - (mapconcat (lambda (f) (if (symbolp f) (symbol-name f) f)) - default ", ")) - ;; If we only want one, and the default is more than one, - ;; discard the unwanted ones. - (t (symbol-name (car default)))))) +If DEFAULT is non-nil, it should be a face (a symbol) or a face +name (a string). It can also be a list of faces or face names. + +If MULTIPLE is non-nil, the return value from this function is a +list of faces. Otherwise a single face is returned. + +If the user enter the empty string at the prompt, DEFAULT is +returned after a possible transformation according to MULTIPLE. +That is, if DEFAULT is a list and MULTIPLE is nil, the first +element of DEFAULT is returned. If DEFAULT isn't a list, but +MULTIPLE is non-nil, a one-element list containing DEFAULT is +returned. Otherwise, DEFAULT is returned verbatim." + (unless (listp default) + (setq default (list default))) + (when default + (setq default + (if multiple + (mapconcat (lambda (f) (if (symbolp f) (symbol-name f) f)) + default ", ") + ;; If we only want one, and the default is more than one, + ;; discard the unwanted ones. + (setq default (car default)) + (if (symbolp default) + (symbol-name default) + default)))) (when (and default (not multiple)) (require 'crm) ;; For compatibility with `completing-read-multiple' use `crm-separator' commit 0c035a742f4298b8a924de70756df730be2de989 Author: Lars Ingebrigtsen Date: Fri Apr 29 16:41:13 2016 +0200 Remove ": ?" from the read-face-name prompt * lisp/faces.el (read-face-name): Remove ": ?" from the prompt to be more backwards compatible (bug#15909). diff --git a/lisp/faces.el b/lisp/faces.el index 7bd8107..1b97093 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1004,6 +1004,10 @@ a single face name." ;; to define DEFAULT if MULTIPLE is nil. (setq default (car (split-string default crm-separator t)))) + ;; Older versions of `read-face-name' did not append ": " to the + ;; prompt, so there are third party libraries that have that in the + ;; prompt. If so, remove it. + (setq prompt (replace-regexp-in-string ": ?\\'" "" prompt)) (let ((prompt (if default (format-message "%s (default `%s'): " prompt default) (format "%s: " prompt))) commit bc5f27aa099cdde02ca66e71501b89300685ab28 Author: Lars Ingebrigtsen Date: Fri Apr 29 15:52:18 2016 +0200 Link from (emacs)Exiting to (lisp)Killing Emacs * doc/emacs/entering.texi (Exiting): Link to the lispref manual for further customisations (bug#15445). diff --git a/doc/emacs/entering.texi b/doc/emacs/entering.texi index 3e936e7..66817e3 100644 --- a/doc/emacs/entering.texi +++ b/doc/emacs/entering.texi @@ -133,6 +133,9 @@ run. One convenient function to use as the value of @code{confirm-kill-emacs} is the function @code{yes-or-no-p}. The default value of @code{confirm-kill-emacs} is @code{nil}. + To further customize what happens when Emacs is exiting, see +@ref{Killing Emacs,,, elisp, The GNU Emacs Lisp Reference Manual}. + @findex kill-emacs To kill Emacs without being prompted about saving, type @kbd{M-x kill-emacs}. commit e4c7657b0d1a31d64ca24bc64b5480cd7687e332 Author: Lars Ingebrigtsen Date: Fri Apr 29 15:37:08 2016 +0200 find-lisp doc touchups * lisp/find-lisp.el (find-lisp-format): Copy over the doc string (bug#15047). (find-lisp-find-files): Clarify doc. diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el index 475001f..8591eb8 100644 --- a/lisp/find-lisp.el +++ b/lisp/find-lisp.el @@ -118,7 +118,7 @@ Argument DIR is the directory containing FILE." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun find-lisp-find-files (directory regexp) - "Find files in DIRECTORY which match REGEXP." + "Find files under DIRECTORY, recursively, that match REGEXP." (let ((file-predicate 'find-lisp-default-file-predicate) (directory-predicate 'find-lisp-default-directory-predicate) (find-lisp-regexp regexp)) @@ -297,6 +297,9 @@ It is a function which takes two arguments, the directory and its parent." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun find-lisp-format (file-name file-attr switches now) + "Format one line of long ls output for file FILE-NAME. +FILE-ATTR and FILE-SIZE give the file's attributes and size. +SWITCHES and TIME-INDEX give the full switch list and time data." (let ((file-type (nth 0 file-attr))) (concat (if (memq ?i switches) ; inode number (format "%6d " (nth 10 file-attr))) @@ -325,7 +328,7 @@ It is a function which takes two arguments, the directory and its parent." "\n"))) (defun find-lisp-time-index (switches) - ;; Return index into file-attributes according to ls SWITCHES. + "Return index into file-attributes according to ls SWITCHES." (cond ((memq ?c switches) 6) ; last mode change ((memq ?u switches) 4) ; last access @@ -333,10 +336,11 @@ It is a function which takes two arguments, the directory and its parent." (t 5))) (defun find-lisp-format-time (file-attr switches now) - ;; Format time string for file with attributes FILE-ATTR according - ;; to SWITCHES (a list of ls option letters of which c and u are recognized). - ;; Use the same method as `ls' to decide whether to show time-of-day or year, - ;; depending on distance between file date and NOW. + "Format time string for file. +This is done with attributes FILE-ATTR according to SWITCHES (a +list of ls option letters of which c and u are recognized). Use +the same method as \"ls\" to decide whether to show time-of-day or +year, depending on distance between file date and NOW." (let* ((time (nth (find-lisp-time-index switches) file-attr)) (diff16 (- (car time) (car now))) (diff (+ (ash diff16 16) (- (car (cdr time)) (car (cdr now))))) commit fb685bc91a72508c97ce7e30f970d4157677f371 Author: Lars Ingebrigtsen Date: Fri Apr 29 15:26:25 2016 +0200 Don't have the manual claim that it lists all CL incompatibilities * doc/misc/cl.texi (Common Lisp Compatibility): The list of incompatibilities isn't exhaustive, so don't say that it is (bug#15171). diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 572124d..4137a95 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -4501,8 +4501,9 @@ referenced by @code{cl-return} or @code{cl-return-from} inside the block. @appendix Common Lisp Compatibility @noindent -The following is a list of all known incompatibilities between this -package and Common Lisp as documented in Steele (2nd edition). +The following is a list of some of the most important +incompatibilities between this package and Common Lisp as documented +in Steele (2nd edition). The word @code{cl-defun} is required instead of @code{defun} in order to use extended Common Lisp argument lists in a function. Likewise, commit 06690371263c2a6d573ba82b4de5e07761550027 Author: Lars Ingebrigtsen Date: Fri Apr 29 15:23:38 2016 +0200 Fix call of `kmacro-display' * lisp/kmacro.el (kmacro-view-ring-2nd): Fix call of `kmacro-display' (bug#15020). diff --git a/lisp/kmacro.el b/lisp/kmacro.el index a368373..2e743b4 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -478,7 +478,7 @@ without repeating the prefix." "Display the current head of the keyboard macro ring." (interactive) (unless (kmacro-ring-empty-p) - (kmacro-display (car (car kmacro-ring)) "2nd macro"))) + (kmacro-display (car (car kmacro-ring)) nil "2nd macro"))) (defun kmacro-cycle-ring-next (&optional _arg) commit e4c26271f2c2fe08f8490e25c63a436ab2a804ca Author: Lars Ingebrigtsen Date: Fri Apr 29 14:36:23 2016 +0200 Change all occurrences of "Mouse-[0-9]" to "mouse-[0-9]" * doc/emacs/*.texi: Change all occurrences of "Mouse-[0-9]" to "mouse-[0-9]". These are case sensitive, and the keys are lower case (bug#14554). diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index 1efd1d9..2eb837f 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -699,10 +699,10 @@ C-b}. To customize this buffer list, use the @code{bs} Custom group @cindex mode, MSB @cindex MSB mode @findex mouse-buffer-menu -@kindex C-Down-Mouse-1 +@kindex C-Down-mouse-1 MSB global minor mode (``MSB'' stands for ``mouse select buffer'') provides a different and customizable mouse buffer menu which you may prefer. It replaces the bindings of @code{mouse-buffer-menu}, -normally on @kbd{C-Down-Mouse-1} and @kbd{C-@key{F10}}, and the menu +normally on @kbd{C-Down-mouse-1} and @kbd{C-@key{F10}}, and the menu bar buffer menu. You can customize the menu in the @code{msb} Custom group. diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index 03fa0ed..a416734 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -929,23 +929,23 @@ still in the right places. @cindex fringes, for debugging @table @asis -@item @kbd{Mouse-1} (in fringe) +@item @kbd{mouse-1} (in fringe) Set or clear a breakpoint on that line. -@item @kbd{C-Mouse-1} (in fringe) +@item @kbd{C-mouse-1} (in fringe) Enable or disable a breakpoint on that line. -@item @kbd{Mouse-3} (in fringe) +@item @kbd{mouse-3} (in fringe) Continue execution to that line. -@item @kbd{C-Mouse-3} (in fringe) +@item @kbd{C-mouse-3} (in fringe) Jump to that line. @end table - On a graphical display, you can click @kbd{Mouse-1} in the fringe of + On a graphical display, you can click @kbd{mouse-1} in the fringe of a source buffer, to set a breakpoint on that line (@pxref{Fringes}). A red dot appears in the fringe, where you clicked. If a breakpoint -already exists there, the click removes it. A @kbd{C-Mouse-1} click +already exists there, the click removes it. A @kbd{C-mouse-1} click enables or disables an existing breakpoint; a breakpoint that is disabled, but not unset, is indicated by a gray dot. @@ -957,10 +957,10 @@ of the window. Disabled breakpoints are indicated with @samp{b}. A solid arrow in the left fringe of a source buffer indicates the line of the innermost frame where the debugged program has stopped. A hollow arrow indicates the current execution line of a higher-level -frame. If you drag the arrow in the fringe with @kbd{Mouse-1}, that +frame. If you drag the arrow in the fringe with @kbd{mouse-1}, that causes execution to advance to the line where you release the button. -Alternatively, you can click @kbd{Mouse-3} in the fringe to advance to -that line. You can click @kbd{C-Mouse-3} in the fringe to jump to +Alternatively, you can click @kbd{mouse-3} in the fringe to advance to +that line. You can click @kbd{C-mouse-3} in the fringe to jump to that line without executing the intermediate lines. This command allows you to go backwards, which can be useful for running through code that has already executed, in order to examine its execution in @@ -994,15 +994,15 @@ Delete the current breakpoint (@code{gdb-delete-breakpoint}). Visit the source line for the current breakpoint (@code{gdb-goto-breakpoint}). -@item Mouse-2 -@kindex Mouse-2 @r{(GDB Breakpoints buffer)} +@item mouse-2 +@kindex mouse-2 @r{(GDB Breakpoints buffer)} Visit the source line for the breakpoint you click on. @end table @vindex gdb-show-threads-by-default When @code{gdb-many-windows} is non-@code{nil}, the GDB Breakpoints buffer shares its window with the GDB Threads buffer. To switch from -one to the other click with @kbd{Mouse-1} on the relevant button in +one to the other click with @kbd{mouse-1} on the relevant button in the header line. If @code{gdb-show-threads-by-default} is non-@code{nil}, the GDB Threads buffer is the one shown by default. @@ -1014,7 +1014,7 @@ non-@code{nil}, the GDB Threads buffer is the one shown by default. debugged program. @xref{Threads, Threads, Debugging programs with multiple threads, gdb, The GNU debugger}. To select a thread, move point there and press @key{RET} (@code{gdb-select-thread}), or click on -it with @kbd{Mouse-2}. This also displays the associated source +it with @kbd{mouse-2}. This also displays the associated source buffer, and updates the contents of the other GDB buffers. You can customize variables under @code{gdb-buffers} group to select @@ -1095,7 +1095,7 @@ debugger}. arrow in the fringe. On text terminals, or when fringes are disabled, the selected stack frame is displayed in reverse contrast. To select a stack frame, move point in its line and type @key{RET} -(@code{gdb-frames-select}), or click @kbd{Mouse-2} on it. Doing so +(@code{gdb-frames-select}), or click @kbd{mouse-2} on it. Doing so also updates the Locals buffer @ifnottex (@pxref{Other GDB Buffers}). @@ -1112,19 +1112,19 @@ also updates the Locals buffer This buffer displays the values of local variables of the current frame for simple data types (@pxref{Frame Info, Frame Info, Information on a frame, gdb, The GNU debugger}). Press @key{RET} or -click @kbd{Mouse-2} on the value if you want to edit it. +click @kbd{mouse-2} on the value if you want to edit it. Arrays and structures display their type only. With GDB 6.4 or later, you can examine the value of the local variable at point by typing -@key{RET}, or with a @kbd{Mouse-2} click. With earlier versions of -GDB, use @key{RET} or @kbd{Mouse-2} on the type description +@key{RET}, or with a @kbd{mouse-2} click. With earlier versions of +GDB, use @key{RET} or @kbd{mouse-2} on the type description (@samp{[struct/union]} or @samp{[array]}). @xref{Watch Expressions}. @item Registers Buffer @findex toggle-gdb-all-registers This buffer displays the values held by the registers (@pxref{Registers,,, gdb, The GNU debugger}). Press @key{RET} or -click @kbd{Mouse-2} on a register if you want to edit its value. With +click @kbd{mouse-2} on a register if you want to edit its value. With GDB 6.4 or later, recently changed register values display with @code{font-lock-warning-face}. @@ -1137,17 +1137,17 @@ the fringe or margin. @item Memory Buffer The memory buffer lets you examine sections of program memory (@pxref{Memory, Memory, Examining memory, gdb, The GNU debugger}). -Click @kbd{Mouse-1} on the appropriate part of the header line to +Click @kbd{mouse-1} on the appropriate part of the header line to change the starting address or number of data items that the buffer displays. Alternatively, use @kbd{S} or @kbd{N} respectively. Click -@kbd{Mouse-3} on the header line to select the display format or unit +@kbd{mouse-3} on the header line to select the display format or unit size for these data items. @end table When @code{gdb-many-windows} is non-@code{nil}, the locals buffer shares its window with the registers buffer, just like breakpoints and threads buffers. To switch from one to the other, click with -@kbd{Mouse-1} on the relevant button in the header line. +@kbd{mouse-1} on the relevant button in the header line. @node Watch Expressions @subsubsection Watch Expressions @@ -1171,7 +1171,7 @@ name and type otherwise. Root expressions also display the frame address as a tooltip to help identify the frame in which they were defined. - To expand or contract a complex data type, click @kbd{Mouse-2} or + To expand or contract a complex data type, click @kbd{mouse-2} or press @key{SPC} on the tag to the left of the expression. Emacs asks for confirmation before expanding the expression if its number of immediate children exceeds the value of the variable @@ -1186,7 +1186,7 @@ expression in the speedbar and type @kbd{D} (@code{gdb-var-delete}). @findex gdb-edit-value To edit a variable with a simple data type, or a simple element of a complex data type, move point there in the speedbar and type @key{RET} -(@code{gdb-edit-value}). Or you can click @kbd{Mouse-2} on a value to +(@code{gdb-edit-value}). Or you can click @kbd{mouse-2} on a value to edit it. Either way, this reads the new value using the minibuffer. @vindex gdb-show-changed-values diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 0fc18fc..60d323b 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -19,8 +19,8 @@ prompts you for the month and year to be the center of the three-month calendar. The calendar uses its own buffer, whose major mode is Calendar mode. - @kbd{Mouse-3} in the calendar brings up a menu of operations on a -particular date; @kbd{Mouse-2} brings up a menu of commonly used + @kbd{mouse-3} in the calendar brings up a menu of operations on a +particular date; @kbd{mouse-2} brings up a menu of commonly used calendar features that are independent of any particular date. To exit the calendar, type @kbd{q}. @@ -460,7 +460,7 @@ to. and can display them. You can add your own holidays to the default list. @table @kbd -@item Mouse-3 Holidays +@item mouse-3 Holidays @itemx h Display holidays for the selected date (@code{calendar-cursor-holidays}). @@ -483,7 +483,7 @@ List holidays in another window for a specified range of years. @vindex calendar-view-holidays-initially-flag To see if any holidays fall on a given date, position point on that date in the calendar window and use the @kbd{h} command. Alternatively, -click on that date with @kbd{Mouse-3} and then choose @kbd{Holidays} +click on that date with @kbd{mouse-3} and then choose @kbd{Holidays} from the menu that appears. Either way, this displays the holidays for that date, in the echo area if they fit there, otherwise in a separate window. @@ -548,7 +548,7 @@ practice}, not historical fact. For example Veteran's Day began in times of sunrise and sunset for any date. @table @kbd -@item Mouse-3 Sunrise/sunset +@item mouse-3 Sunrise/sunset @itemx S Display times of sunrise and sunset for the selected date (@code{calendar-sunrise-sunset}). @@ -565,7 +565,7 @@ Display times of sunrise and sunset for the selected month. @findex sunrise-sunset Within the calendar, to display the @emph{local times} of sunrise and sunset in the echo area, move point to the date you want, and type -@kbd{S}. Alternatively, click @kbd{Mouse-3} on the date, then choose +@kbd{S}. Alternatively, click @kbd{mouse-3} on the date, then choose @samp{Sunrise/sunset} from the menu that appears. The command @kbd{M-x sunrise-sunset} is available outside the calendar to display this information for today's date or a specified date. To specify a date @@ -777,7 +777,7 @@ in various other calendar systems: @table @kbd @kindex p @r{(Calendar mode)} @findex calendar-print-other-dates -@item Mouse-3 Other calendars +@item mouse-3 Other calendars @itemx p o Display the selected date in various other calendars. (@code{calendar-print-other-dates}). @@ -831,7 +831,7 @@ Display Mayan date for selected day (@code{calendar-mayan-print-date}). appropriate command starting with @kbd{p} from the table above. The prefix @kbd{p} is a mnemonic for ``print'', since Emacs ``prints'' the equivalent date in the echo area. @kbd{p o} displays the -date in all forms known to Emacs. You can also use @kbd{Mouse-3} and +date in all forms known to Emacs. You can also use @kbd{mouse-3} and then choose @kbd{Other calendars} from the menu that appears. This displays the equivalent forms of the date in all the calendars Emacs understands, in the form of a menu. (Choosing an alternative from @@ -1020,7 +1020,7 @@ it. You can also view today's events outside of Calendar mode. In the following, key bindings refer to the Calendar buffer. @table @kbd -@item Mouse-3 Diary +@item mouse-3 Diary @itemx d Display all diary entries for the selected date (@code{diary-view-entries}). @@ -1058,7 +1058,7 @@ entries for that many successive days. Thus, @kbd{2 d} displays all the entries for the selected date and for the following day. Another way to display the diary entries for a date is to click -@kbd{Mouse-3} on the date, and then choose @kbd{Diary entries} from +@kbd{mouse-3} on the date, and then choose @kbd{Diary entries} from the menu that appears. If the variable @code{calendar-view-diary-initially-flag} is non-@code{nil}, creating the calendar lists the diary entries for the current date (provided the diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index d2de679..68c6813 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi @@ -353,8 +353,8 @@ file. @xref{Windows}. Visit the file described on the current line, and display the buffer in another window, but do not select that window (@code{dired-display-file}). -@item Mouse-1 -@itemx Mouse-2 +@item mouse-1 +@itemx mouse-2 @findex dired-mouse-find-file-other-window Visit the file whose name you clicked on (@code{dired-mouse-find-file-other-window}). This uses another window diff --git a/doc/emacs/fixit.texi b/doc/emacs/fixit.texi index b398a7d..584efc6 100644 --- a/doc/emacs/fixit.texi +++ b/doc/emacs/fixit.texi @@ -408,7 +408,7 @@ buffers, add @code{flyspell-mode} to @code{text-mode-hook}. @findex flyspell-auto-correct-word @findex flyspell-correct-word-before-point When Flyspell mode highlights a word as misspelled, you can click on -it with @kbd{Mouse-2} (@code{flyspell-correct-word}) to display a menu +it with @kbd{mouse-2} (@code{flyspell-correct-word}) to display a menu of possible corrections and actions. In addition, @kbd{C-.} or @kbd{@key{ESC}-@key{TAB}} (@code{flyspell-auto-correct-word}) will propose various successive corrections for the word at point, and diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 383ae7f..23ccd6a 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -70,22 +70,22 @@ for doing so on MS-DOS). Menus are supported on all text terminals. @cindex mouse buttons (what they do) @cindex mouse, selecting text using -@kindex Mouse-1 -@kindex Mouse-2 -@kindex Mouse-3 +@kindex mouse-1 +@kindex mouse-2 +@kindex mouse-3 @table @kbd -@item Mouse-1 +@item mouse-1 Move point to where you click (@code{mouse-set-point}). -@item Drag-Mouse-1 +@item Drag-mouse-1 Activate the region around the text selected by dragging, and put the text in the primary selection (@code{mouse-set-region}). -@item Mouse-2 +@item mouse-2 Move point to where you click, and insert the contents of the primary selection there (@code{mouse-yank-primary}). -@item Mouse-3 +@item mouse-3 If the region is active, move the nearer end of the region to the click position; otherwise, set mark at the current value of point and point at the click position. Save the resulting region in the kill @@ -94,7 +94,7 @@ ring; on a second click, kill it (@code{mouse-save-then-kill}). @findex mouse-set-point The most basic mouse command is @code{mouse-set-point}, which is -invoked by clicking with the left mouse button, @kbd{Mouse-1}, in the +invoked by clicking with the left mouse button, @kbd{mouse-1}, in the text area of a window. This moves point to the position where you clicked. If that window was not the selected window, it becomes the selected window. @@ -110,7 +110,7 @@ the window and sets the cursor position. @cindex mouse, dragging @findex mouse-set-region - Holding down @kbd{Mouse-1} and dragging the mouse over a stretch + Holding down @kbd{mouse-1} and dragging the mouse over a stretch of text activates the region around that text (@code{mouse-set-region}), placing the mark where you started holding down the mouse button, and point where you release it (@pxref{Mark}). @@ -132,49 +132,49 @@ on how far away from the window edge the mouse has gone; the variable @findex mouse-yank-primary @findex mouse-yank-at-click - Clicking with the middle mouse button, @kbd{Mouse-2}, moves point to + Clicking with the middle mouse button, @kbd{mouse-2}, moves point to the position where you clicked and inserts the contents of the primary selection (@code{mouse-yank-primary}). @xref{Primary Selection}. This behavior is consistent with other X applications. Alternatively, -you can rebind @kbd{Mouse-2} to @code{mouse-yank-at-click}, which +you can rebind @kbd{mouse-2} to @code{mouse-yank-at-click}, which performs a yank at the position you click. @vindex mouse-yank-at-point If you change the variable @code{mouse-yank-at-point} to a -non-@code{nil} value, @kbd{Mouse-2} does not move point; it inserts +non-@code{nil} value, @kbd{mouse-2} does not move point; it inserts the text at point, regardless of where you clicked or even which of the frame's windows you clicked on. This variable affects both @code{mouse-yank-primary} and @code{mouse-yank-at-click}. @findex mouse-save-then-kill - Clicking with the right mouse button, @kbd{Mouse-3}, runs the + Clicking with the right mouse button, @kbd{mouse-3}, runs the command @code{mouse-save-then-kill}. This performs several actions depending on where you click and the status of the region: @itemize @bullet @item -If no region is active, clicking @kbd{Mouse-3} activates the region, +If no region is active, clicking @kbd{mouse-3} activates the region, placing the mark where point was and point at the clicked position. @item -If a region is active, clicking @kbd{Mouse-3} adjusts the nearer end +If a region is active, clicking @kbd{mouse-3} adjusts the nearer end of the region by moving it to the clicked position. The adjusted region's text is copied to the kill ring; if the text in the original region was already on the kill ring, it replaces it there. @item If you originally specified the region using a double or triple -@kbd{Mouse-1}, so that the region is defined to consist of entire +@kbd{mouse-1}, so that the region is defined to consist of entire words or lines (@pxref{Word and Line Mouse}), then adjusting the -region with @kbd{Mouse-3} also proceeds by entire words or lines. +region with @kbd{mouse-3} also proceeds by entire words or lines. @item -If you use @kbd{Mouse-3} a second time consecutively, at the same +If you use @kbd{mouse-3} a second time consecutively, at the same place, that kills the region already selected. Thus, the simplest way -to kill text with the mouse is to click @kbd{Mouse-1} at one end, then -click @kbd{Mouse-3} twice at the other end. To copy the text into the -kill ring without deleting it from the buffer, press @kbd{Mouse-3} -just once---or just drag across the text with @kbd{Mouse-1}. Then you +to kill text with the mouse is to click @kbd{mouse-1} at one end, then +click @kbd{mouse-3} twice at the other end. To copy the text into the +kill ring without deleting it from the buffer, press @kbd{mouse-3} +just once---or just drag across the text with @kbd{mouse-1}. Then you can copy it elsewhere by yanking it. @end itemize @@ -209,12 +209,12 @@ speed is linked to how fast you move the wheel. @node Word and Line Mouse @section Mouse Commands for Words and Lines - These variants of @kbd{Mouse-1} select entire words or lines at a + These variants of @kbd{mouse-1} select entire words or lines at a time. Emacs activates the region around the selected text, which is also copied to the kill ring. @table @kbd -@item Double-Mouse-1 +@item Double-mouse-1 Select the text around the word which you click on. Double-clicking on a character with symbol syntax (such as @@ -226,20 +226,20 @@ ends. Double-clicking on a character with string-delimiter syntax constant (Emacs uses heuristics to figure out whether that character is the beginning or the end of it). -@item Double-Drag-Mouse-1 +@item Double-Drag-mouse-1 Select the text you drag across, in the form of whole words. -@item Triple-Mouse-1 +@item Triple-mouse-1 Select the line you click on. -@item Triple-Drag-Mouse-1 +@item Triple-Drag-mouse-1 Select the text you drag across, in the form of whole lines. @end table @node Mouse References @section Following References with the Mouse -@kindex Mouse-1 @r{(on buttons)} -@kindex Mouse-2 @r{(on buttons)} +@kindex mouse-1 @r{(on buttons)} +@kindex mouse-2 @r{(on buttons)} @cindex hyperlinks @cindex links @cindex text buttons @@ -256,14 +256,14 @@ cursor changes and the button lights up. If you change the variable highlighting. You can activate a button by moving point to it and typing -@key{RET}, or by clicking either @kbd{Mouse-1} or @kbd{Mouse-2} on the +@key{RET}, or by clicking either @kbd{mouse-1} or @kbd{mouse-2} on the button. For example, in a Dired buffer, each file name is a button; activating it causes Emacs to visit that file (@pxref{Dired}). In a @file{*Compilation*} buffer, each error message is a button, and activating it visits the source code for that error (@pxref{Compilation}). - Although clicking @kbd{Mouse-1} on a button usually activates the + Although clicking @kbd{mouse-1} on a button usually activates the button, if you hold the mouse button down for a period of time before releasing it (specifically, for more than 450 milliseconds), then Emacs moves point where you clicked, without activating the button. @@ -271,20 +271,20 @@ In this way, you can use the mouse to move point over a button without activating it. Dragging the mouse over or onto a button has its usual behavior of setting the region, and does not activate the button. - You can change how @kbd{Mouse-1} applies to buttons by customizing + You can change how @kbd{mouse-1} applies to buttons by customizing the variable @code{mouse-1-click-follows-link}. If the value is a positive integer, that determines how long you need to hold the mouse button down for, in milliseconds, to cancel button activation; the default is 450, as described in the previous paragraph. If the value -is @code{nil}, @kbd{Mouse-1} just sets point where you clicked, and +is @code{nil}, @kbd{mouse-1} just sets point where you clicked, and does not activate buttons. If the value is @code{double}, double clicks activate buttons but single clicks just set point. @vindex mouse-1-click-in-non-selected-windows - Normally, @kbd{Mouse-1} on a button activates the button even if it + Normally, @kbd{mouse-1} on a button activates the button even if it is in a non-selected window. If you change the variable @code{mouse-1-click-in-non-selected-windows} to @code{nil}, -@kbd{Mouse-1} on a button in an unselected window moves point to the +@kbd{mouse-1} on a button in an unselected window moves point to the clicked position and selects that window, without activating the button. @@ -295,21 +295,21 @@ button. bring up menus. @table @kbd -@item C-Mouse-1 -@kindex C-Mouse-1 +@item C-mouse-1 +@kindex C-mouse-1 This menu is for selecting a buffer. The MSB (``mouse select buffer'') global minor mode makes this menu smarter and more customizable. @xref{Buffer Menus}. -@item C-Mouse-2 -@kindex C-Mouse-2 +@item C-mouse-2 +@kindex C-mouse-2 This menu contains entries for examining faces and other text properties, and well as for setting them (the latter is mainly useful when editing enriched text; @pxref{Enriched Text}). -@item C-Mouse-3 -@kindex C-Mouse-3 +@item C-mouse-3 +@kindex C-mouse-3 This menu is mode-specific. For most modes if Menu-bar mode is on, this menu has the same items as all the mode-specific menu-bar menus put together. Some modes may specify a different menu for this @@ -318,15 +318,15 @@ which would be present in the menu bar---not just the mode-specific ones---so that you can access them without having to display the menu bar. -@item S-Mouse-1 +@item S-mouse-1 This menu is for changing the default face within the window's buffer. @xref{Text Scale}. @end table - Some graphical applications use @kbd{Mouse-3} for a mode-specific -menu. If you prefer @kbd{Mouse-3} in Emacs to bring up such a menu + Some graphical applications use @kbd{mouse-3} for a mode-specific +menu. If you prefer @kbd{mouse-3} in Emacs to bring up such a menu instead of running the @code{mouse-save-then-kill} command, rebind -@kbd{Mouse-3} by adding the following line to your init file +@kbd{mouse-3} by adding the following line to your init file (@pxref{Init Rebinding}): @c FIXME: `mouse-popup-menubar-stuff' is obsolete since 23.1. @@ -349,32 +349,32 @@ the special bindings will be displayed (@pxref{Tooltips}). This section's commands do not apply in those areas. @table @kbd -@item Mouse-1 -@kindex Mouse-1 @r{(mode line)} -@kbd{Mouse-1} on a mode line selects the window it belongs to. By -dragging @kbd{Mouse-1} on the mode line, you can move it, thus +@item mouse-1 +@kindex mouse-1 @r{(mode line)} +@kbd{mouse-1} on a mode line selects the window it belongs to. By +dragging @kbd{mouse-1} on the mode line, you can move it, thus changing the height of the windows above and below. Changing heights with the mouse in this way never deletes windows, it just refuses to make any window smaller than the minimum height. -@item Mouse-2 -@kindex Mouse-2 @r{(mode line)} -@kbd{Mouse-2} on a mode line expands that window to fill its frame. +@item mouse-2 +@kindex mouse-2 @r{(mode line)} +@kbd{mouse-2} on a mode line expands that window to fill its frame. -@item Mouse-3 -@kindex Mouse-3 @r{(mode line)} -@kbd{Mouse-3} on a mode line deletes the window it belongs to. If the +@item mouse-3 +@kindex mouse-3 @r{(mode line)} +@kbd{mouse-3} on a mode line deletes the window it belongs to. If the frame has only one window, it does nothing. -@item C-Mouse-2 +@item C-mouse-2 @kindex C-mouse-2 @r{(mode line)} -@kbd{C-Mouse-2} on a mode line splits that window, producing two +@kbd{C-mouse-2} on a mode line splits that window, producing two side-by-side windows with the boundary running through the click position (@pxref{Split Window}). @end table -@kindex Mouse-1 @r{(scroll bar)} - Furthermore, by clicking and dragging @kbd{Mouse-1} on the divider +@kindex mouse-1 @r{(scroll bar)} + Furthermore, by clicking and dragging @kbd{mouse-1} on the divider between two side-by-side mode lines, you can move the vertical boundary to the left or right. @@ -919,17 +919,17 @@ those are drawn by the toolkit and not directly by Emacs. @cindex Vertical Scroll Bar On graphical displays, there is a @dfn{vertical scroll bar} on the -side of each Emacs window. Clicking @kbd{Mouse-1} on the scroll bar's +side of each Emacs window. Clicking @kbd{mouse-1} on the scroll bar's up and down buttons scrolls the window by one line at a time. Clicking -@kbd{Mouse-1} above or below the scroll bar's inner box scrolls the +@kbd{mouse-1} above or below the scroll bar's inner box scrolls the window by nearly the entire height of the window, like @kbd{M-v} and @kbd{C-v} respectively (@pxref{Moving Point}). Dragging the inner box scrolls continuously. If Emacs is compiled on the X Window System without X toolkit -support, the scroll bar behaves differently. Clicking @kbd{Mouse-1} +support, the scroll bar behaves differently. Clicking @kbd{mouse-1} anywhere on the scroll bar scrolls forward like @kbd{C-v}, while -@kbd{Mouse-3} scrolls backward like @kbd{M-v}. Clicking @kbd{Mouse-2} +@kbd{mouse-3} scrolls backward like @kbd{M-v}. Clicking @kbd{mouse-2} in the scroll bar lets you drag the inner box up and down. @findex scroll-bar-mode @@ -975,8 +975,8 @@ when the entire buffer is visible. @cindex Horizontal Scroll Bar mode On graphical displays with toolkit support, Emacs may also supply a @dfn{horizontal scroll bar} on the bottom of each window. Clicking -@kbd{Mouse-1} on the that scroll bar's left and right buttons scrolls -the window horizontally by one column at a time. Clicking @kbd{Mouse-1} +@kbd{mouse-1} on the that scroll bar's left and right buttons scrolls +the window horizontally by one column at a time. Clicking @kbd{mouse-1} on the left or right of the scroll bar's inner box scrolls the window by four columns. Dragging the inner box scrolls the window continuously. @@ -1066,11 +1066,11 @@ argument is positive, off if the argument is not positive. To control the use of menu bars at startup, customize the variable @code{menu-bar-mode}. -@kindex C-Mouse-3 @r{(when menu bar is disabled)} +@kindex C-mouse-3 @r{(when menu bar is disabled)} Expert users often turn off the menu bar, especially on text terminals, where this makes one additional line available for text. If the menu bar is off, you can still pop up a menu of its contents -with @kbd{C-Mouse-3} on a display which supports pop-up menus. +with @kbd{C-mouse-3} on a display which supports pop-up menus. @xref{Menu Mouse Clicks}. @xref{Menu Bar}, for information on how to invoke commands with the diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 172d058..4b7b7fc 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -343,7 +343,7 @@ invoke it with. In our example, it would say that you can invoke For more information about a function definition, variable or symbol property listed in an apropos buffer, you can click on it with -@kbd{Mouse-1} or @kbd{Mouse-2}, or move there and type @key{RET}. +@kbd{mouse-1} or @kbd{mouse-2}, or move there and type @key{RET}. When you specify more than one word in the apropos pattern, a name must contain at least two of the words in order to match. Thus, if @@ -404,8 +404,8 @@ Follow a cross reference at point (@code{help-follow}). Move point forward to the next hyperlink (@code{forward-button}). @item S-@key{TAB} Move point back to the previous hyperlink (@code{backward-button}). -@item Mouse-1 -@itemx Mouse-2 +@item mouse-1 +@itemx mouse-2 Follow a hyperlink that you click on. @item C-c C-c Show all documentation about the symbol at point @@ -427,7 +427,7 @@ Go back to the previous help topic (@code{help-go-back}). appears in the documentation in the help buffer, it is normally an underlined @dfn{hyperlink}. To view the associated documentation, move point there and type @key{RET} (@code{help-follow}), or click on -the hyperlink with @kbd{Mouse-1} or @kbd{Mouse-2}. Doing so replaces +the hyperlink with @kbd{mouse-1} or @kbd{mouse-2}. Doing so replaces the contents of the help buffer; to retrace your steps, type @kbd{C-c C-b} (@code{help-go-back}). While retracing your steps, you can go forward by using @kbd{C-c C-b} (@code{help-go-forward}). diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index dd3671c..107adb9 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -587,9 +587,9 @@ you can access it using the following Emacs commands: @table @kbd @findex mouse-set-secondary -@kindex M-Drag-Mouse-1 +@kindex M-Drag-mouse-1 @cindex secondary-selection face -@item M-Drag-Mouse-1 +@item M-Drag-mouse-1 Set the secondary selection, with one end at the place where you press down the button, and the other end at the place where you release it (@code{mouse-set-secondary}). The selected text is highlighted, using @@ -600,31 +600,31 @@ window, just like @code{mouse-set-region} (@pxref{Mouse Commands}). This command does not alter the kill ring. @findex mouse-start-secondary -@kindex M-Mouse-1 -@item M-Mouse-1 +@kindex M-mouse-1 +@item M-mouse-1 Set one endpoint for the @dfn{secondary selection} (@code{mouse-start-secondary}). @findex mouse-secondary-save-then-kill -@kindex M-Mouse-3 -@item M-Mouse-3 +@kindex M-mouse-3 +@item M-mouse-3 Set the secondary selection, with one end at the position clicked and -the other at the position specified with @kbd{M-Mouse-1} +the other at the position specified with @kbd{M-mouse-1} (@code{mouse-secondary-save-then-kill}). This also puts the selected -text in the kill ring. A second @kbd{M-Mouse-3} at the same place +text in the kill ring. A second @kbd{M-mouse-3} at the same place kills the secondary selection just made. @findex mouse-yank-secondary -@kindex M-Mouse-2 -@item M-Mouse-2 +@kindex M-mouse-2 +@item M-mouse-2 Insert the secondary selection where you click, placing point at the end of the yanked text (@code{mouse-yank-secondary}). @end table -Double or triple clicking of @kbd{M-Mouse-1} operates on words and -lines, much like @kbd{Mouse-1}. +Double or triple clicking of @kbd{M-mouse-1} operates on words and +lines, much like @kbd{mouse-1}. -If @code{mouse-yank-at-point} is non-@code{nil}, @kbd{M-Mouse-2} yanks +If @code{mouse-yank-at-point} is non-@code{nil}, @kbd{M-mouse-2} yanks at point. Then it does not matter precisely where you click, or even which of the frame's windows you click on. @xref{Mouse Commands}. diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 71d2e99..b0597dc 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -51,9 +51,9 @@ modifier keys; a value to @code{left} means be the same key as @code{ns-alternate-modifier}; a value of @code{none} tells Emacs to ignore them. - @kbd{S-Mouse-1} adjusts the region to the click position, -just like @kbd{Mouse-3} (@code{mouse-save-then-kill}); it does not pop -up a menu for changing the default face, as @kbd{S-Mouse-1} normally + @kbd{S-mouse-1} adjusts the region to the click position, +just like @kbd{mouse-3} (@code{mouse-save-then-kill}); it does not pop +up a menu for changing the default face, as @kbd{S-mouse-1} normally does (@pxref{Text Scale}). This change makes Emacs behave more like other Mac / GNUstep applications. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 168f26d..1037bd1 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -432,7 +432,7 @@ to the master repository. On a graphical display, you can move the mouse over this mode line indicator to pop up a tool-tip, which displays a more verbose -description of the version control status. Pressing @kbd{Mouse-1} +description of the version control status. Pressing @kbd{mouse-1} over the indicator pops up a menu of VC commands, identical to @samp{Tools / Version Control} on the menu bar. @@ -1335,7 +1335,7 @@ their single-buffer counterparts (@pxref{Search}). @cindex stashes in version control @cindex shelves in version control The above commands are also available via the menu bar, and via a -context menu invoked by @kbd{Mouse-2}. Furthermore, some VC backends +context menu invoked by @kbd{mouse-2}. Furthermore, some VC backends use the menu to provide extra backend-specific commands. For example, Git and Bazaar allow you to manipulate @dfn{stashes} and @dfn{shelves} (where are a way to temporarily put aside uncommitted changes, and @@ -1813,7 +1813,7 @@ object-oriented language, or if there's a function and a variable by the same name), the command shows the candidate definitions in a @file{*xref*} buffer, together with the files in which these definitions are found. Selecting one of these candidates by typing -@kbd{@key{RET}} or clicking @kbd{Mouse-2} will pop a buffer showing +@kbd{@key{RET}} or clicking @kbd{mouse-2} will pop a buffer showing the corresponding definition. When entering the identifier argument to @kbd{M-.}, the usual @@ -1865,7 +1865,7 @@ the special XREF mode: @table @kbd @item @key{RET} -@itemx Mouse-2 +@itemx mouse-2 Display the reference on the current line and bury the @file{*xref*} buffer. @item n diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index dd47532..fdba0a4 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -69,9 +69,9 @@ The same. @item C-x C-x Set the mark at point, and activate it; then move point where the mark used to be (@code{exchange-point-and-mark}). -@item Drag-Mouse-1 +@item Drag-mouse-1 Set point and the mark around the text you drag across. -@item Mouse-3 +@item mouse-3 Set the mark at point, then move point to where you click (@code{mouse-save-then-kill}). @item @samp{Shifted cursor motion keys} diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi index 6ab716d..be4206c 100644 --- a/doc/emacs/mini.texi +++ b/doc/emacs/mini.texi @@ -219,7 +219,7 @@ set the variable @code{enable-recursive-minibuffers} to @code{t}. @findex minibuffer-inactive-mode When not active, the minibuffer is in @code{minibuffer-inactive-mode}, -and clicking @kbd{Mouse-1} there shows the @file{*Messages*} buffer. +and clicking @kbd{mouse-1} there shows the @file{*Messages*} buffer. If you use a dedicated frame for minibuffers, Emacs also recognizes certain keys there, for example @kbd{n} to make a new frame. @@ -337,8 +337,8 @@ used with the completion list: @table @kbd @findex mouse-choose-completion -@item Mouse-1 -@itemx Mouse-2 +@item mouse-1 +@itemx mouse-2 Clicking mouse button 1 or 2 on a completion alternative chooses it (@code{mouse-choose-completion}). diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 20f2d66..5786bc4 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1217,7 +1217,7 @@ submit the copy as input with @key{RET}. If you wish, you can edit the copy before resubmitting it. If you use this command on an output line, it copies that line to the end of the buffer. -@item Mouse-2 +@item mouse-2 If @code{comint-use-prompt-regexp} is @code{nil} (the default), copy the old input command that you click on, inserting the copy at the end of the buffer (@code{comint-insert-input}). If @@ -1226,7 +1226,7 @@ not over old input, just yank as usual. @end table Moving to a previous input and then copying it with @kbd{C-c -@key{RET}} or @kbd{Mouse-2} produces the same results---the same +@key{RET}} or @kbd{mouse-2} produces the same results---the same buffer contents---that you would get by using @kbd{M-p} enough times to fetch that previous input from the history list. However, @kbd{C-c @key{RET}} copies the text from the buffer, which can be different @@ -2135,7 +2135,7 @@ You can also type @kbd{M-x pr-interface @key{RET}}; this creates a @file{*Printing Interface*} buffer, similar to a customization buffer, where you can set the printing options. After selecting what and how to print, you start the print job using the @samp{Print} button (click -@kbd{Mouse-2} on it, or move point over it and type @key{RET}). For +@kbd{mouse-2} on it, or move point over it and type @key{RET}). For further information on the various options, use the @samp{Interface Help} button. @@ -2644,8 +2644,8 @@ typing @kbd{M-x goto-address-mode}. When this buffer-local minor mode is enabled, it finds all the URLs in the buffer, highlights them, and turns them into clickable buttons. You can follow the URL by typing @kbd{C-c @key{RET}} (@code{goto-address-at-point}) while point is on -its text; or by clicking with @kbd{Mouse-2}, or by clicking -@kbd{Mouse-1} quickly (@pxref{Mouse References}). Following a URL is +its text; or by clicking with @kbd{mouse-2}, or by clicking +@kbd{mouse-1} quickly (@pxref{Mouse References}). Following a URL is done by calling @code{browse-url} as a subroutine (@pxref{Browse-URL}). @@ -2718,12 +2718,12 @@ point (@code{dired-at-point}). @code{ffap-dired-other-frame}, analogous to @code{dired-other-frame}. @item M-x ffap-next Search buffer for next file name or URL, then find that file or URL. -@item S-Mouse-3 -@kindex S-Mouse-3 @r{(FFAP)} +@item S-mouse-3 +@kindex S-mouse-3 @r{(FFAP)} @code{ffap-at-mouse} finds the file guessed from text around the position of a mouse click. -@item C-S-Mouse-3 -@kindex C-S-Mouse-3 @r{(FFAP)} +@item C-S-mouse-3 +@kindex C-S-mouse-3 @r{(FFAP)} Display a menu of files and URLs mentioned in current buffer, then find the one you select (@code{ffap-menu}). @end table diff --git a/doc/emacs/msdos-xtra.texi b/doc/emacs/msdos-xtra.texi index 45edd6c..89c14d2 100644 --- a/doc/emacs/msdos-xtra.texi +++ b/doc/emacs/msdos-xtra.texi @@ -122,8 +122,8 @@ and the menu bar (@pxref{Menu Bar}). @end ifnottex Scroll bars don't work in MS-DOS Emacs. PC mice usually have only -two buttons; these act as @kbd{Mouse-1} and @kbd{Mouse-2}, but if you -press both of them together, that has the effect of @kbd{Mouse-3}. If +two buttons; these act as @kbd{mouse-1} and @kbd{mouse-2}, but if you +press both of them together, that has the effect of @kbd{mouse-3}. If the mouse does have 3 buttons, Emacs detects that at startup, and all the 3 buttons function normally, as on X. diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index a0b1d62..e735343 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -499,7 +499,7 @@ the alternative. Typing a number selects the associated alternative of the current row and uses it as input. @key{TAB} in these Chinese input methods displays a buffer showing -all the possible characters at once; then clicking @kbd{Mouse-2} on +all the possible characters at once; then clicking @kbd{mouse-2} on one of them selects that alternative. The keys @kbd{C-f}, @kbd{C-b}, @kbd{C-n}, @kbd{C-p}, and digits continue to work as usual, but they do the highlighting in the buffer showing the possible characters, @@ -1036,7 +1036,7 @@ decoding it using coding system @var{right} instead. the current buffer (i.e., the coding system to use when saving or reverting the file). You specify which coding system using the minibuffer. You can also invoke this command by clicking with -@kbd{Mouse-3} on the coding system indicator in the mode line +@kbd{mouse-3} on the coding system indicator in the mode line (@pxref{Mode Line}). If you specify a coding system that cannot handle all the characters diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 780e00c..0c79d9c 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -1305,7 +1305,7 @@ count as blocks. @kindex C-c @@ C-M-s @kindex C-c @@ C-r @kindex C-c @@ C-l -@kindex S-Mouse-2 +@kindex S-mouse-2 @table @kbd @item C-c @@ C-h Hide the current block (@code{hs-hide-block}). @@ -1313,7 +1313,7 @@ Hide the current block (@code{hs-hide-block}). Show the current block (@code{hs-show-block}). @item C-c @@ C-c Either hide or show the current block (@code{hs-toggle-hiding}). -@item S-Mouse-2 +@item S-mouse-2 Toggle hiding for the block you click on (@code{hs-mouse-toggle-hiding}). @item C-c @@ C-M-h Hide all top-level blocks (@code{hs-hide-all}). diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index ef9894d..a8cf5e4 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1252,8 +1252,8 @@ Address mode: @end example @noindent -Then you can browse these URLs by clicking on them with @kbd{Mouse-2} -(or @kbd{Mouse-1} quickly) or by moving to one and typing @kbd{C-c +Then you can browse these URLs by clicking on them with @kbd{mouse-2} +(or @kbd{mouse-1} quickly) or by moving to one and typing @kbd{C-c @key{RET}}. @xref{Goto Address mode, Activating URLs, Activating URLs}. @node Rmail Coding diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 459e844..7958a4a 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -203,10 +203,10 @@ saved in the search ring is specified by the variable @cindex incremental search, edit search string @cindex interactively edit search string @kindex M-e @r{(Incremental search)} -@kindex Mouse-1 @r{in the minibuffer (Incremental Search)} +@kindex mouse-1 @r{in the minibuffer (Incremental Search)} To edit the current search string in the minibuffer without replacing it with items from the search ring, type @kbd{M-e} or click -@kbd{Mouse-1} in the minibuffer. Type @key{RET}, @kbd{C-s} or +@kbd{mouse-1} in the minibuffer. Type @key{RET}, @kbd{C-s} or @kbd{C-r} to finish editing the string and search for it. Type @kbd{C-f} or @kbd{@key{RIGHT}} to add to the search string characters following point from the buffer from which you started the search. @@ -234,7 +234,7 @@ end of a line, it appends the next line. With a prefix argument @kindex C-y @r{(Incremental search)} @kindex M-y @r{(Incremental search)} -@kindex Mouse-2 @r{in the minibuffer (Incremental search)} +@kindex mouse-2 @r{in the minibuffer (Incremental search)} @findex isearch-yank-kill @findex isearch-yank-pop @findex isearch-yank-x-selection @@ -242,7 +242,7 @@ end of a line, it appends the next line. With a prefix argument 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}). Clicking @kbd{Mouse-2} +(@code{yank-pop}) command (@pxref{Yanking}). Clicking @kbd{mouse-2} in the echo area appends the current X selection (@pxref{Primary Selection}) to the search string (@code{isearch-yank-x-selection}). diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 41abb42..e199250 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1255,7 +1255,7 @@ C-x} exits two folds and leaves the text and subheadings exposed. folds, and for showing and hiding text: @table @asis -@item @kbd{C-M-Mouse-1} zooms in on the heading clicked on +@item @kbd{C-M-mouse-1} zooms in on the heading clicked on @itemize @w{} @item single click: expose body. @@ -1266,7 +1266,7 @@ triple click: expose body and subheadings. @item quad click: expose entire subtree. @end itemize -@item @kbd{C-M-Mouse-2} exposes text under the heading clicked on +@item @kbd{C-M-mouse-2} exposes text under the heading clicked on @itemize @w{} @item single click: expose body. @@ -1277,7 +1277,7 @@ triple click: expose body and subheadings. @item quad click: expose entire subtree. @end itemize -@item @kbd{C-M-Mouse-3} hides text under the heading clicked on or exits fold +@item @kbd{C-M-mouse-3} hides text under the heading clicked on or exits fold @itemize @w{} @item single click: hide subtree. @@ -2156,7 +2156,7 @@ want to set the justification style to @code{unfilled} The easiest way to alter properties is with the @samp{Text Properties} menu. You can get to this menu from the @samp{Edit} menu -in the menu bar (@pxref{Menu Bar}), or with @kbd{C-Mouse-2} +in the menu bar (@pxref{Menu Bar}), or with @kbd{C-mouse-2} (@pxref{Menu Mouse Clicks}). Some of the commands in the @samp{Text Properties} menu are listed below (you can also invoke them with @kbd{M-x}): diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 702963f..bb8b68b 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -71,7 +71,7 @@ Split the selected window into two windows, one above the other @item C-x 3 Split the selected window into two windows, positioned side by side (@code{split-window-right}). -@item C-Mouse-2 +@item C-mouse-2 In the mode line of a window, split that window. @end table @@ -129,12 +129,12 @@ truncation glyphs, the margins, and the scroll bar. On text terminals, side-by-side windows are separated by a vertical divider which is drawn using the @code{vertical-border} face. -@kindex C-Mouse-2 @r{(mode line)} -@kindex C-Mouse-2 @r{(scroll bar)} - If you click @kbd{C-Mouse-2} in the mode line of a window, that +@kindex C-mouse-2 @r{(mode line)} +@kindex C-mouse-2 @r{(scroll bar)} + If you click @kbd{C-mouse-2} in the mode line of a window, that splits the window, putting a vertical divider where you click. Depending on how Emacs is compiled, you can also split a window by -clicking @kbd{C-Mouse-2} in the scroll bar, which puts a horizontal +clicking @kbd{C-mouse-2} in the scroll bar, which puts a horizontal divider where you click (this feature does not work when Emacs uses GTK+ scroll bars). @@ -158,8 +158,8 @@ this option is @code{nil}. Select another window (@code{other-window}). @item C-M-v Scroll the next window (@code{scroll-other-window}). -@item Mouse-1 -@kbd{Mouse-1}, in the text area of a window, selects the window and +@item mouse-1 +@kbd{mouse-1}, in the text area of a window, selects the window and moves point to the position clicked. Clicking in the mode line selects the window without moving point in it. @end table diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 3cd1d4e..2607788 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5983,7 +5983,7 @@ A string displayed by the Emacs tool-tip help system; by default, @item follow-link @kindex follow-link @r{(button property)} -The follow-link property, defining how a @key{Mouse-1} click behaves +The follow-link property, defining how a @key{mouse-1} click behaves on this button, @xref{Clickable Text}. @item button @@ -6170,7 +6170,7 @@ additionally available in the keymap stored in @code{button-buffer-map} as a parent keymap for its keymap. If the button has a non-@code{nil} @code{follow-link} property, and -@code{mouse-1-click-follows-link} is set, a quick @key{Mouse-1} click +@code{mouse-1-click-follows-link} is set, a quick @key{mouse-1} click will also activate the @code{push-button} command. @xref{Clickable Text}. diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 991b47d..0323678 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -3784,7 +3784,7 @@ properties. For simplicity, we will refer to the clickable text as a Implementing a link involves three separate steps: (1) indicating clickability when the mouse moves over the link; (2) making @key{RET} -or @kbd{Mouse-2} on that link do something; and (3) setting up a +or @kbd{mouse-2} on that link do something; and (3) setting up a @code{follow-link} condition so that the link obeys @code{mouse-1-click-follows-link}. @@ -3806,10 +3806,10 @@ names are clickable: help-echo "mouse-2: visit this file in other window"))) @end smallexample - To make the link clickable, bind @key{RET} and @kbd{Mouse-2} to + To make the link clickable, bind @key{RET} and @kbd{mouse-2} to commands that perform the desired action. Each command should check to see whether it was called on a link, and act accordingly. For -instance, Dired's major mode keymap binds @kbd{Mouse-2} to the +instance, Dired's major mode keymap binds @kbd{mouse-2} to the following command: @smallexample @@ -3852,12 +3852,12 @@ bind it within the link text, using the @code{keymap} text property @noindent With this method, you can easily define different commands for different links. Furthermore, the global definition of @key{RET} and -@kbd{Mouse-2} remain available for the rest of the text in the buffer. +@kbd{mouse-2} remain available for the rest of the text in the buffer. @vindex mouse-1-click-follows-link - The basic Emacs command for clicking on links is @kbd{Mouse-2}. + The basic Emacs command for clicking on links is @kbd{mouse-2}. However, for compatibility with other graphical applications, Emacs -also recognizes @kbd{Mouse-1} clicks on links, provided the user +also recognizes @kbd{mouse-1} clicks on links, provided the user clicks on the link quickly without moving the mouse. This behavior is controlled by the user option @code{mouse-1-click-follows-link}. @xref{Mouse References,,, emacs, The GNU Emacs Manual}. @@ -3871,9 +3871,9 @@ mode keymap or a local keymap specified via the @code{keymap} text property). The value of the @code{follow-link} property, or the binding for the @code{follow-link} event, acts as a condition for the link action. This condition tells Emacs two things: the -circumstances under which a @kbd{Mouse-1} click should be regarded as +circumstances under which a @kbd{mouse-1} click should be regarded as occurring inside the link, and how to compute an action code -that says what to translate the @kbd{Mouse-1} click into. The link +that says what to translate the @kbd{mouse-1} click into. The link action condition can be one of the following: @table @asis @@ -3882,7 +3882,7 @@ If the condition is the symbol @code{mouse-face}, a position is inside a link if there is a non-@code{nil} @code{mouse-face} property at that position. The action code is always @code{t}. -For example, here is how Info mode handles @key{Mouse-1}: +For example, here is how Info mode handles @key{mouse-1}: @smallexample (define-key Info-mode-map [follow-link] 'mouse-face) @@ -3894,7 +3894,7 @@ is inside a link if @code{(@var{func} @var{pos})} evaluates to non-@code{nil}. The value returned by @var{func} serves as the action code. -For example, here is how pcvs enables @kbd{Mouse-1} to follow links on +For example, here is how pcvs enables @kbd{mouse-1} to follow links on file names only: @smallexample @@ -3912,27 +3912,27 @@ to the entire buffer). @end table @noindent -The action code tells @kbd{Mouse-1} how to follow the link: +The action code tells @kbd{mouse-1} how to follow the link: @table @asis @item a string or vector -If the action code is a string or vector, the @kbd{Mouse-1} event is +If the action code is a string or vector, the @kbd{mouse-1} event is translated into the first element of the string or vector; i.e., the -action of the @kbd{Mouse-1} click is the local or global binding of +action of the @kbd{mouse-1} click is the local or global binding of that character or symbol. Thus, if the action code is @code{"foo"}, -@kbd{Mouse-1} translates into @kbd{f}. If it is @code{[foo]}, -@kbd{Mouse-1} translates into @key{foo}. +@kbd{mouse-1} translates into @kbd{f}. If it is @code{[foo]}, +@kbd{mouse-1} translates into @key{foo}. @item anything else -For any other non-@code{nil} action code, the @kbd{Mouse-1} event is -translated into a @kbd{Mouse-2} event at the same position. +For any other non-@code{nil} action code, the @kbd{mouse-1} event is +translated into a @kbd{mouse-2} event at the same position. @end table - To define @kbd{Mouse-1} to activate a button defined with + To define @kbd{mouse-1} to activate a button defined with @code{define-button-type}, give the button a @code{follow-link} property. The property value should be a link action condition, as described above. @xref{Buttons}. For example, here is how Help mode -handles @kbd{Mouse-1}: +handles @kbd{mouse-1}: @smallexample (define-button-type 'help-xref @@ -3940,11 +3940,11 @@ handles @kbd{Mouse-1}: 'action #'help-button-action) @end smallexample - To define @kbd{Mouse-1} on a widget defined with + To define @kbd{mouse-1} on a widget defined with @code{define-widget}, give the widget a @code{:follow-link} property. The property value should be a link action condition, as described above. For example, here is how the @code{link} widget specifies that -a @key{Mouse-1} click shall be translated to @key{RET}: +a @key{mouse-1} click shall be translated to @key{RET}: @smallexample (define-widget 'link 'item diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 28fa42b..816cb56 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -421,9 +421,9 @@ regions in the buffer. Please notice the help strings in the echo area when the mouse moves over a sensitive region. @cindex context menu -A click with @kbd{Mouse-3} on a mouse-sensitive region opens a context +A click with @kbd{mouse-3} on a mouse-sensitive region opens a context menu. In addition to this, each buffer also has a buffer-specific menu -that is opened with a click with @kbd{Mouse-3} somewhere in the buffer +that is opened with a click with @kbd{mouse-3} somewhere in the buffer where no highlight is displayed. @@ -488,7 +488,7 @@ editing. @end table The same functionality is available from the menu opened with -@kbd{Mouse-3} on the class name. +@kbd{mouse-3} on the class name. @@ -551,7 +551,7 @@ Display a list of types. @end table These lists are also available from the class' context menu invoked with -@kbd{Mouse-3} on the class name. +@kbd{mouse-3} on the class name. @@ -898,7 +898,7 @@ You can install a hook function to perform actions after a member or class declaration or definition has been found, or when it is not found. All the commands described above can also be found in the context menu -displayed when clicking @kbd{Mouse-2} on a member name. +displayed when clicking @kbd{mouse-2} on a member name. diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi index 1fa4649..fd4fd4f 100644 --- a/doc/misc/efaq.texi +++ b/doc/misc/efaq.texi @@ -2408,7 +2408,7 @@ error messages, inserts them into a special buffer called the source. Type @kbd{C-x `} to step through the offending lines one by one (starting with Emacs 22, you can also use @kbd{M-g M-p} and @kbd{M-g M-n} to go to the previous and next matches directly). Click -@kbd{Mouse-2} or press @key{RET} on a message text in the +@kbd{mouse-2} or press @key{RET} on a message text in the @file{*compilation*} buffer to go to the line whose number is mentioned in that message. @@ -3888,7 +3888,7 @@ is how to make @kbd{H-M-RIGHT} move forward a word: Not all modifiers are permitted in all situations. @key{Hyper}, @key{Super}, and @key{Alt} are not available on Unix character terminals. Non-@acronym{ASCII} keys and mouse events (e.g., @kbd{C-=} and -@kbd{Mouse-1}) also fall under this category. +@kbd{mouse-1}) also fall under this category. @end itemize diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 64b1585..26c81d6 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi @@ -1281,7 +1281,7 @@ the routine documentation header and/or routine source. @kindex M-? In any IDL program (or, as with most IDLWAVE commands, in the IDL Shell), press @kbd{M-?} (@code{idlwave-context-help}), or click with -@kbd{S-Mouse-3} to access context sensitive online help. The following +@kbd{S-mouse-3} to access context sensitive online help. The following locations are recognized context for help: @cindex Context, for online help @@ -1327,11 +1327,11 @@ which online help can be accessed. @itemize @bullet @item Online help for routines and keywords can be accessed through the -Routine Info display. Click with @kbd{Mouse-3} on an item to see the +Routine Info display. Click with @kbd{mouse-3} on an item to see the corresponding help (@pxref{Routine Info}). @item When using completion and Emacs pops up a @file{*Completions*} buffer -with possible completions, clicking with @kbd{Mouse-3} on a completion +with possible completions, clicking with @kbd{mouse-3} on a completion item invokes help on that item (@pxref{Completion}). Items for which help is available in the online system documentation (vs. just the program source itself) will be emphasized (e.g., colored blue). @@ -1577,7 +1577,7 @@ search for a procedure matching a regexp. If the list of completions is too long to fit in the @file{*Completions*} window, the window can be scrolled by pressing @kbd{M-@key{TAB}} repeatedly. Online help (if installed) for each -possible completion is available by clicking with @kbd{Mouse-3} on the +possible completion is available by clicking with @kbd{mouse-3} on the item. Items for which system online help (from the IDL manual) is available will be emphasized (e.g., colored blue). For other items, the corresponding source code or DocLib header will be used as the help @@ -2811,7 +2811,7 @@ you add or remove some on the command line) using @kbd{C-c C-d C-l}. In recent IDLWAVE versions, the breakpoint line is highlighted when the mouse is moved over it, and a tooltip pops up describing the break -details. @kbd{Mouse-3} on the breakpoint line pops up a menu of +details. @kbd{mouse-3} on the breakpoint line pops up a menu of breakpoint actions, including clearing, disabling, and adding or changing break conditions or ``after'' break count. @@ -3151,7 +3151,7 @@ print, only an initial portion of long arrays will be printed, up to For added speed and convenience, there are mouse bindings which allow you to click on expressions and examine their values. Use -@kbd{S-Mouse-2} to print an expression and @kbd{C-M-Mouse-2} to invoke +@kbd{S-mouse-2} to print an expression and @kbd{C-M-mouse-2} to invoke help (i.e., you need to hold down @key{META} and @key{CONTROL} while clicking with the middle mouse button). If you simply click, the nearest expression will be selected in the same manner as described @@ -3219,7 +3219,7 @@ mouse examine command, and two macros for generating your own examine key and mouse bindings. The most powerful and flexible mouse examine command of all is -available on @kbd{C-S-Mouse-2}. Just as for all the other mouse +available on @kbd{C-S-mouse-2}. Just as for all the other mouse examine commands, it permits click or drag expression selection, but instead of sending hard-coded commands to the shell, it pops-up a customizable selection list of examine functions to choose among, diff --git a/doc/misc/info.texi b/doc/misc/info.texi index 135c443..0a8100f 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi @@ -671,7 +671,7 @@ the @key{Shift} key and then press @key{TAB}). that subtopic's node. @cindex mouse support in Info mode -@kindex Mouse-2 @r{(Info mode)} +@kindex mouse-2 @r{(Info mode)} If your terminal supports a mouse, you have yet another way of going to a subtopic. Move your mouse pointer to the subtopic line, somewhere between the beginning @samp{*} and the colon @samp{:} which @@ -679,22 +679,22 @@ ends the subtopic's brief name. You will see the subtopic's name change its appearance (usually, its background color will change), and the shape of the mouse pointer will change if your platform supports that. After a while, if you leave the mouse on that spot, a small -window will pop up, saying ``Mouse-2: go to that node,'' or the same +window will pop up, saying ``mouse-2: go to that node,'' or the same message may appear at the bottom of the screen. - @kbd{Mouse-2} is the second button of your mouse counting from the + @kbd{mouse-2} is the second button of your mouse counting from the left---the middle button on a 3-button mouse. (On a 2-button mouse, you may have to press both buttons together to ``press the middle -button''.) The message tells you pressing @kbd{Mouse-2} with the +button''.) The message tells you pressing @kbd{mouse-2} with the current position of the mouse pointer (on subtopic in the menu) will go to that subtopic. @findex Info-mouse-follow-nearest-node - More generally, @kbd{Mouse-2} in an Info buffer finds the nearest + More generally, @kbd{mouse-2} in an Info buffer finds the nearest link to another node and goes there. For example, near a cross reference it acts like @kbd{f}, in a menu it acts like @kbd{m}, on the node's header line it acts like @kbd{n}, @kbd{p}, or @kbd{u}, etc. At -end of the node's text @kbd{Mouse-2} moves to the next node, or up if +end of the node's text @kbd{mouse-2} moves to the next node, or up if there's no next node. @format @@ -719,7 +719,7 @@ to the subnode that the @kbd{u} command brought you from. (Some Info readers may put you at the @emph{front} of the node instead---to get back to where you were reading, you have to type some @key{SPC}s.) - Another way to go Up is to click @kbd{Mouse-2} on the @samp{Up} + Another way to go Up is to click @kbd{mouse-2} on the @samp{Up} pointer shown in the header line (provided that you have a mouse). @format @@ -740,7 +740,7 @@ in Emacs. Do @kbd{M-x visible-mode} to show or hide it.) @findex Info-follow-reference You can follow a cross reference by moving the cursor to it and press @key{RET}, just as in a menu. In Emacs, you can also click -@kbd{Mouse-1} on a cross reference to follow it; you can see that the +@kbd{mouse-1} on a cross reference to follow it; you can see that the cross reference is mouse-sensitive by moving the mouse pointer to the reference and watching how the underlying text and the mouse pointer change in response. diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index d1fd8f7..c48e4a4 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -1566,7 +1566,7 @@ M-x mh-rmail @key{RET} bob @key{RET}}). @xref{Folders}.}. @findex display-time @vindex read-mail-command -There are some commands that need to read mail, such as @kbd{Mouse-2} +There are some commands that need to read mail, such as @kbd{mouse-2} over the @samp{Mail} button that @code{display-time} adds to the mode line. You can configure Emacs to have these commands use MH-E by setting the option @code{read-mail-command} to @samp{mh-rmail}. @@ -1835,9 +1835,9 @@ minibuffer (@code{mh-prefix-help}). Unpack message created with @command{uudecode} or @command{shar} (@code{mh-store-msg}). @c ------------------------- -@kindex Mouse-2 +@kindex mouse-2 @findex mh-show-mouse -@item Mouse-2 +@item mouse-2 Move point to mouse event and show message (@code{mh-show-mouse}). @end table @@ -1845,12 +1845,12 @@ Within the MH-Show buffer, the following command is defined. @table @kbd @kindex @key{RET} -@kindex Mouse-1 -@kindex Mouse-2 +@kindex mouse-1 +@kindex mouse-2 @findex mh-press-button @item @key{RET} -@itemx Mouse-1 -@itemx Mouse-2 +@itemx mouse-1 +@itemx mouse-2 View contents of button (@code{mh-press-button}). @end table @@ -2022,10 +2022,10 @@ detail in the following sections. @kindex @key{BS} @kindex @key{RET} @kindex @key{SPC} -@kindex Mouse-2 +@kindex mouse-2 The command @key{RET} (@code{mh-show}) displays the message that the -cursor is on while @kbd{Mouse-2} (@code{mh-show-mouse}) displays the +cursor is on while @kbd{mouse-2} (@code{mh-show-mouse}) displays the message that the mouse cursor is on. If the message is already displayed, it scrolls to the beginning of the message. Use @key{SPC} (@code{mh-page-msg}) and @key{BS} (@code{mh-previous-page}) to move @@ -2201,13 +2201,13 @@ highlighting of citations entirely, choose @samp{None}. @cindex links, following @findex goto-address-at-point @kindex C-c @key{RET} -@kindex Mouse-2 +@kindex mouse-2 @vindex goto-address-highlight-p Email addresses and URLs in the message are highlighted if the option @code{goto-address-highlight-p} is on, which it is by default. To view the web page for a highlighted URL or to send a message using a -highlighted email address, use @kbd{Mouse-2} or @kbd{C-c @key{RET}} +highlighted email address, use @kbd{mouse-2} or @kbd{C-c @key{RET}} (@code{goto-address-at-point}). @xref{Sending Mail}, to see how to configure Emacs to send the message using MH-E. @@ -2337,11 +2337,11 @@ Attachments in MH-E are indicated by @dfn{buttons} like this: @kindex @key{RET} @kindex K @key{TAB} @kindex K S-@key{TAB} -@kindex Mouse-1 -@kindex Mouse-2 +@kindex mouse-1 +@kindex mouse-2 -To view the contents of the button, use either @kbd{Mouse-1} or -@kbd{Mouse-2} on the button or @key{RET} (@code{mh-press-button}) when +To view the contents of the button, use either @kbd{mouse-1} or +@kbd{mouse-2} on the button or @key{RET} (@code{mh-press-button}) when the cursor is over the button. This command is a toggle so if you use it again on the same attachment, it is hidden. If Emacs does not know how to display the attachment, then Emacs offers to save the @@ -2561,11 +2561,11 @@ includes the results of a quick poll of MH-E users from 2005-12-23. @table @asis @cindex browser, @samp{w3m} @cindex @samp{w3m} -@kindex Mouse-2 +@kindex mouse-2 @item @samp{w3m} 7 The @samp{w3m} browser requires an external program. It's quick, produces pretty nice output, and best of all, it's the only browser -that highlights links. These can be clicked with @kbd{Mouse-2} to view +that highlights links. These can be clicked with @kbd{mouse-2} to view the content of the link in @samp{w3m}. The @samp{w3m} browser handles tables well and actually respects the table's width parameter (which can cause text to wrap if the author didn't anticipate that the page @@ -2650,7 +2650,7 @@ documentation for the Gnus command @kbd{W h} (see section @cindex @file{.emacs} @cindex files, @file{.emacs} @findex browse-url-at-mouse -@kindex S-Mouse-2 +@kindex S-mouse-2 A useful key binding that you can add to @file{~/.emacs} is the following which displays an HTML link or textual URL in an external @@ -6261,7 +6261,7 @@ containing the value for the field is given. @findex mh-visit-folder @kindex F v @kindex M-x speedbar -@kindex Mouse-2 +@kindex mouse-2 You can also use the speedbar @ifnothtml @@ -6275,7 +6275,7 @@ Speedbar Frames} in @cite{The GNU Emacs Manual}) to view your folders. To bring up the speedbar, run @kbd{M-x speedbar @key{RET}}. You will see a new frame appear with all of your MH folders. Folders with unseen messages appear in boldface. Click on a -folder name with @kbd{Mouse-2} to visit that folder in a similar +folder name with @kbd{mouse-2} to visit that folder in a similar fashion to the command @kbd{F v} (@code{mh-visit-folder}) (@pxref{Folders}). Click on the @samp{+} icon to expand and view the sub-folders of that folder. @@ -6310,9 +6310,9 @@ count before the next automatic update (@code{mh-speed-refresh}). @findex delete-frame @kindex C-x 5 0 -@kindex Mouse-3 +@kindex mouse-3 -You can click on @kbd{Mouse-3} to bring up a context menu that +You can click on @kbd{mouse-3} to bring up a context menu that contains these items. Dismiss the speedbar with @kbd{C-x 5 0} (@code{delete-frame}). diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index f11e0b8..a8684a4 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -1173,7 +1173,7 @@ the declaration line of the function or tag on the topmost line in the text area. This allows you to keep that declaration line in view at all times, even if it is scrolls off the ``top'' of the screen. -In addition, clicking @kbd{Mouse-1} on the header line opens a context +In addition, clicking @kbd{mouse-1} on the header line opens a context menu that contains menu items for copying, killing, or narrowing to that tag. @@ -1199,7 +1199,7 @@ Semantic Highlight Function minor mode highlights the declaration line of the current function or tag (that is to say, the first line that describes the rest of the construct). -In addition, clicking @kbd{Mouse-3} on the highlighted declaration +In addition, clicking @kbd{mouse-3} on the highlighted declaration line opens a context menu that contains menu items for copying, killing, or narrowing to that tag. diff --git a/doc/misc/speedbar.texi b/doc/misc/speedbar.texi index 377e412..d43c521 100644 --- a/doc/misc/speedbar.texi +++ b/doc/misc/speedbar.texi @@ -62,7 +62,7 @@ authors of other packages to provide speedbar summaries customized to the needs of that mode. Throughout this manual, activities are defined as ``clicking on'', or -``expanding'' items. Clicking means using @kbd{Mouse-2} on a +``expanding'' items. Clicking means using @kbd{mouse-2} on a button. Expanding refers to clicking on an expansion button to display an expanded summary of the entry the expansion button is on. @xref{Basic Navigation}. @@ -316,29 +316,29 @@ with the mouse, or affected by the menu. The mouse bindings are: @table @kbd -@item Mouse-1 +@item mouse-1 Move cursor to that location. -@item Mouse-2 -@itemx Double-Mouse-1 -Activate the current button. @kbd{Double-Mouse-1} is called a @dfn{double +@item mouse-2 +@itemx Double-mouse-1 +Activate the current button. @kbd{Double-mouse-1} is called a @dfn{double click} on other platforms, and is useful for windows users with two button mice. -@c Isn't it true that with two-button mice, the right button is Mouse-2? -@c On GNU/Linux, the right button is Mouse-3. -@item S-Mouse-2 -@itemx S-Double-Mouse-1 +@c Isn't it true that with two-button mice, the right button is mouse-2? +@c On GNU/Linux, the right button is mouse-3. +@item S-mouse-2 +@itemx S-Double-mouse-1 @cindex power click -This has the same effect as @kbd{Mouse-2}, except it is called a power +This has the same effect as @kbd{mouse-2}, except it is called a power click. This means that if a group with an expansion button @samp{+} is clicked, any caches are flushed, and subitems re-read. If it is a name, it will be opened in a new frame. -@item Mouse-3 +@item mouse-3 Activate the speedbar menu. The item selected affects the line clicked, not the line where the cursor was. -@item Mouse-1 @r{(mode line)} +@item mouse-1 @r{(mode line)} Activate the menu. This affects the item the cursor is on before the click, since the mouse was not clicked on anything. -@item C-Mouse-1 +@item C-mouse-1 Buffers sub-menu. The buffer in the attached frame is switched. @end table @@ -355,7 +355,7 @@ You can display different data by using different display modes. These specialized modes make it easier to navigate the relevant pieces of information, such as files and directories, or buffers. -In the main menu, found by clicking @kbd{Mouse-3}, there is a submenu +In the main menu, found by clicking @kbd{mouse-3}, there is a submenu labeled @samp{Displays}. This submenu lets you easily choose between different display modes. diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 3f81f67..6b169f3 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -2591,7 +2591,7 @@ occurrence of the pattern to search for. Note: while loading initially, Viper binds this mouse action only if it is not already bound to something else. If you want to use the mouse-search -feature, and the @kbd{Meta-Shift-Mouse-1} mouse action is already bound to +feature, and the @kbd{Meta-Shift-mouse-1} mouse action is already bound to something else, you can rebind the mouse-search feature by setting @code{viper-mouse-search-key} to something else in your Viper customization file: @@ -2669,8 +2669,8 @@ purpose of mouse search and mouse insert. By default, this is set to @code{double-click-time} in Emacs and to @code{mouse-track-multi-click-time} milliseconds in XEmacs. @end table -@kindex @kbd{S-Mouse-1} -@kindex @kbd{S-Mouse-2} +@kindex @kbd{S-mouse-1} +@kindex @kbd{S-mouse-2} @kindex @kbd{meta shift button1up} @kindex @kbd{meta shift button2up} @vindex @code{viper-multiclick-timeout} @@ -4428,7 +4428,7 @@ The following two mouse actions are normally bound to special search and insert commands in of Viper: @table @kbd -@item S-Mouse-1 +@item S-mouse-1 Holding Shift and clicking mouse button 1 will initiate search for a region under the mouse pointer. @@ -4437,7 +4437,7 @@ binding only if this mouse action is not already bound to something else. @xref{Viper Specials}, for more information. -@item S-Mouse-2 +@item S-mouse-2 Holding Shift and clicking button 2 of the mouse will insert a region surrounding the mouse pointer. This command can also take a prefix argument. @@ -4445,8 +4445,8 @@ Note: Viper sets this binding only if this mouse action is not already bound to something else. @xref{Viper Specials}, for more details. @end table -@kindex @kbd{S-Mouse-1} -@kindex @kbd{S-Mouse-2} +@kindex @kbd{S-mouse-1} +@kindex @kbd{S-mouse-2} @kindex @kbd{meta button1up} @kindex @kbd{meta button2up} diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi index 49606ed..953bcae 100644 --- a/doc/misc/widget.texi +++ b/doc/misc/widget.texi @@ -243,8 +243,8 @@ If point is not located on a button, invoke the binding in @code{widget-global-map} (by default the global map). @end deffn -@kindex Mouse-2 @r{(on button widgets}) -@item Mouse-2 +@kindex mouse-2 @r{(on button widgets}) +@item mouse-2 @deffn Command widget-button-click @var{event} Invoke the button at the location of the mouse pointer. If the mouse pointer is located in an editable text field, invoke the binding in @@ -456,7 +456,7 @@ There is a standard widget keymap which you might find useful. @findex widget-button-click @defvr Const widget-keymap @key{TAB} and @kbd{C-@key{TAB}} are bound to @code{widget-forward} and -@code{widget-backward}, respectively. @key{RET} and @kbd{Mouse-2} +@code{widget-backward}, respectively. @key{RET} and @kbd{mouse-2} are bound to @code{widget-button-press} and @code{widget-button-click}. @end defvr diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi index 59320d2..f1fbba6 100644 --- a/doc/misc/woman.texi +++ b/doc/misc/woman.texi @@ -671,19 +671,19 @@ to other man pages. If these man pages are installed then WoMan can easily be directed to follow the reference, i.e., to find and format the man page. When the mouse is passed over a correctly formatted reference it is highlighted, in which case clicking the middle button -@kbd{Mouse-2} will cause WoMan to follow the reference. Alternatively, +@kbd{mouse-2} will cause WoMan to follow the reference. Alternatively, when point is over such a reference the key @key{RET} will follow the reference. Any word in the buffer can be used as a reference by clicking -@kbd{Mouse-2} over it provided the Meta key is also used (although in +@kbd{mouse-2} over it provided the Meta key is also used (although in general such a ``reference'' will not lead to a man page). Alternatively, the key @kbd{r} allows completion to be used to select a reference to follow, based on the word at point as default. @table @kbd -@item @kbd{Mouse-2} -@kindex Mouse-2 +@item @kbd{mouse-2} +@kindex mouse-2 @findex woman-mouse-2 Run WoMan with word under mouse as topic (@code{woman-mouse-2}). The word must be mouse-highlighted unless @code{woman-mouse-2} is used with