diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/emulation | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/keypad.el | 16 | ||||
| -rw-r--r-- | lisp/emulation/viper-keym.el | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el index 8d5e6cf9b5b..b4911102a72 100644 --- a/lisp/emulation/keypad.el +++ b/lisp/emulation/keypad.el @@ -199,15 +199,15 @@ keys are bound. Setup Binding ------------------------------------------------------------- - 'prefix Command prefix argument, i.e. M-0 .. M-9 and M-- - '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; - this enables any user-defined bindings for the keypad keys - in the global and local keymaps. + `prefix' Command prefix argument, i.e. M-0 .. M-9 and M-- + `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; + this enables any user-defined bindings for the keypad keys + in the global and local keymaps. -If SETUP is 'numeric and the optional fourth argument DECIMAL is non-nil, +If SETUP is `numeric' and the optional fourth argument DECIMAL is non-nil, the decimal key on the keypad is mapped to DECIMAL instead of `.'" (let* ((i 0) (var (cond diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 272556d3bae..e26994cd130 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -497,7 +497,7 @@ Useful in some modes, such as Gnus, MH, etc.") "Override some vi-state or insert-state bindings in the current buffer. The effect is seen in the current buffer only. Useful for customizing mailer buffers, gnus, etc. -STATE is 'vi-state, 'insert-state, or 'emacs-state +STATE is `vi-state', `insert-state', or `emacs-state'. 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. |