diff options
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 10 | ||||
| -rw-r--r-- | lisp/emulation/edt-mapper.el | 6 | ||||
| -rw-r--r-- | lisp/emulation/keypad.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 12 | ||||
| -rw-r--r-- | lisp/emulation/viper-ex.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper-keym.el | 8 | ||||
| -rw-r--r-- | lisp/emulation/viper-mous.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/viper.el | 4 |
8 files changed, 24 insertions, 24 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 54f881bde8a..b6620499603 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -67,7 +67,7 @@ ;; In addition to using the shifted movement keys, you can also use ;; [C-space] to start the region and use unshifted movement keys to extend -;; it. To cancel the region, use [C-space] or [C-g]. +;; it. To cancel the region, use [C-space] or [C-g]. ;; If you prefer to use the standard Emacs cut, copy, paste, and undo ;; bindings, customize cua-enable-cua-keys to nil. @@ -116,7 +116,7 @@ ;; "register commands". ;; ;; CUA's register support is activated by providing a numeric -;; prefix argument to the C-x, C-c, and C-v commands. For example, +;; prefix argument to the C-x, C-c, and C-v commands. For example, ;; to copy the selected region to register 2, enter [M-2 C-c]. ;; Or if you have activated the keypad prefix mode, enter [kp-2 C-c]. ;; @@ -182,7 +182,7 @@ ;; If you type a normal (self-inserting) character when the rectangle is ;; active, the character is inserted on the "current side" of every line ;; of the rectangle. The "current side" is the side on which the cursor -;; is currently located. If the rectangle is only 1 column wide, +;; is currently located. If the rectangle is only 1 column wide, ;; insertion will be performed to the left when the cursor is at the ;; bottom of the rectangle. So, for example, to comment out an entire ;; paragraph like this one, just place the cursor on the first character @@ -360,7 +360,7 @@ managers, so try setting this to nil, if prefix override doesn't work." :type 'boolean) (defcustom cua-paste-pop-rotate-temporarily nil - "If non-nil, \\[cua-paste-pop] only rotates the kill-ring temporarily. + "If non-nil, \\[cua-paste-pop] only rotates the kill ring temporarily. This means that both \\[yank] and the first \\[yank-pop] in a sequence always insert the most recently killed text. Each immediately following \\[cua-paste-pop] replaces the previous text with the next older element on the `kill-ring'. @@ -1140,7 +1140,7 @@ If ARG is the atom `-', scroll upward by nearly full screen." def nil)) (defvar cua-global-keymap (make-sparse-keymap) - "Global keymap for cua-mode; users may add to this keymap.") + "Global keymap for `cua-mode'; users may add to this keymap.") (defvar cua--cua-keys-keymap (make-sparse-keymap)) (defvar cua--prefix-override-keymap (make-sparse-keymap)) diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index a723dbdbb90..8a42f893152 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el @@ -55,7 +55,7 @@ ;; Usage: -;; Simply load this file into emacs and run the function edt-mapper, +;; Simply load this file into Emacs and run the function edt-mapper, ;; using the following command. ;; emacs -q -l edt-mapper -f edt-mapper @@ -82,8 +82,8 @@ ;; Sometimes, edt-mapper will ignore a key you press, and just ;; continue to prompt for the same key. This can happen when your -;; window manager sucks up the key and doesn't pass it on to emacs, -;; or it could be an emacs bug. Either way, there's nothing that +;; window manager sucks up the key and doesn't pass it on to Emacs, +;; or it could be an Emacs bug. Either way, there's nothing that ;; edt-mapper can do about it. You must press RETURN, to skip the ;; current key and continue. Later, you and/or your local Emacs guru ;; can try to figure out why the key is being ignored. diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el index 56202c7fff8..4500faae57b 100644 --- a/lisp/emulation/keypad.el +++ b/lisp/emulation/keypad.el @@ -27,7 +27,7 @@ ;; ;; With the following setup, the keypad can be used for numeric data ;; entry when NumLock is off, and to give numeric prefix arguments to -;; emacs commands, when NumLock is on. +;; Emacs commands, when NumLock is on. ;; ;; keypad-setup => Plain Numeric Keypad ;; keypad-numlock-setup => Prefix numeric args @@ -203,7 +203,7 @@ keys are bound. `S-cursor' Bind shifted keypad keys to the shifted cursor movement keys. `cursor' Bind keypad keys to the cursor movement keys. `numeric' Plain numeric keypad, i.e. 0 .. 9 and . (or DECIMAL arg) - `none' Removes all bindings for keypad keys in function-key-map; + `none' Removes all bindings for keypad keys in `function-key-map'; this enables any user-defined bindings for the keypad keys in the global and local keymaps. diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 728f790a962..c3b36f10aed 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -91,7 +91,7 @@ space return delete backspace ) - "Movement commands") + "Movement commands.") ;; define viper-movement-command-p (viper-test-com-defun viper-movement-command) @@ -487,7 +487,7 @@ (viper-change-state-to-vi)) (defun viper-set-mode-vars-for (state) - "Sets Viper minor mode variables to put Viper's state STATE in effect." + "Set Viper minor mode variables to put Viper's state STATE in effect." ;; Emacs state (setq viper-vi-minibuffer-minor-mode nil @@ -1197,7 +1197,7 @@ as a Meta key and any number of multiple escapes are allowed." ) (defsubst viper-yank-last-insertion () - "Inserts the text saved by the previous viper-save-last-insertion command." + "Insert the text saved by the previous viper-save-last-insertion command." (condition-case nil (insert viper-last-insertion) (error nil))) @@ -1500,7 +1500,7 @@ Doesn't change viper-command-ring in any way, so `.' will work as before executing this command. This command is supposed to be bound to a two-character Vi macro where the second character is a digit 0 to 9. The digit indicates which -history command to execute. `<char>0' is equivalent to `.', `<char>1' +history command to execute. `<char>0' is equivalent to `.', `<char>1' invokes the command before that, etc." (interactive) (let* ((viper-intermediate-command 'repeating-display-destructive-command) @@ -3838,7 +3838,7 @@ Null string will repeat previous search." ;; yank and pop (defsubst viper-yank (text) - "Yank TEXT silently. This works correctly with Emacs's yank-pop command." + "Yank TEXT silently. This works correctly with Emacs's `yank-pop' command." (insert text) (setq this-command 'yank)) @@ -4510,7 +4510,7 @@ One can use \\=`\\=` and \\='\\=' to temporarily jump 1 step back." (defun viper-set-expert-level (&optional dont-change-unless) - "Sets the expert level for a Viper user. + "Set the expert level for a Viper user. Can be called interactively to change (temporarily or permanently) the current expert level. diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el index 55930e7e6bc..e93666956ce 100644 --- a/lisp/emulation/viper-ex.el +++ b/lisp/emulation/viper-ex.el @@ -2176,7 +2176,7 @@ Please contact your system administrator. ")))))) (goto-char beg))))) (defun ex-compile () - "Reads args from the command line, then runs make with the args. + "Read args from the command line, then run make with the args. If no args are given, then it runs the last compile command. Type `mak ' (including the space) to run make with no args." (let (args) diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 4a9070e84be..75b627ea6a7 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -86,8 +86,8 @@ major mode in effect." "Keymap for user-defined local bindings. Useful for changing bindings such as ZZ in certain major modes. For instance, in letter-mode, one may want to bind ZZ to -mh-send-letter. In a newsreader such as gnus, tin, or rn, ZZ could be bound -to save-buffers-kill-emacs then post article, etc.") +`mh-send-letter'. In a newsreader such as gnus, tin, or rn, ZZ could be bound +to `save-buffers-kill-emacs' then post article, etc.") (put 'viper-vi-local-user-map 'permanent-local t) (defvar viper-vi-global-user-map (make-sparse-keymap) @@ -491,7 +491,7 @@ ALIST is of the form ((KEY . FUNC) (KEY . FUNC) ...) Normally, this would be called from a hook to a major mode or on a per buffer basis. Usage: - (viper-add-local-keys state \\='((key-str . func) (key-str . func)...)) " + (viper-add-local-keys state \\='((key-str . func) (key-str . func)...))" (let (map) (cond ((eq state 'vi-state) @@ -520,7 +520,7 @@ Usage: (defun viper-zap-local-keys () "Unconditionally reset Viper viper-*-local-user-map's. Rarely useful, but if you made a mistake by switching to a mode that adds -undesirable local keys, e.g., comint-mode, then this function can restore +undesirable local keys, e.g., `comint-mode', then this function can restore sanity." (interactive) (setq viper-vi-local-user-map (make-sparse-keymap) diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el index 83fc5afafa5..98b123a7f49 100644 --- a/lisp/emulation/viper-mous.el +++ b/lisp/emulation/viper-mous.el @@ -116,7 +116,7 @@ considered related." (buffer-name (viper-mouse-click-window-buffer click))) (defsubst viper-mouse-click-posn (click) - "Returns position of a click." + "Return position of a click." (declare (obsolete nil "27.1")) (posn-point (event-start click))) diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index cce51174336..6ba265f8abf 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -15,7 +15,7 @@ ;; of the bug report be sent to the maintainer's email address. (defconst viper-version "3.14.2 of July 4, 2013" - "The current version of Viper") + "The current version of Viper.") ;; This file is part of GNU Emacs. @@ -516,7 +516,7 @@ If Viper is enabled, turn it off. Otherwise, turn it on." ;;;###autoload (defun viper-mode () - "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'." + "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'." (interactive) (if (not noninteractive) (progn |