diff options
| author | Joakim Verona <joakim@verona.se> | 2015-02-08 21:55:28 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2015-02-08 21:55:28 +0100 |
| commit | 5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529 (patch) | |
| tree | 860e0d53399626aee6249ebb5f972879f403b228 /lisp/emulation | |
| parent | 148262ce3db990ed16989341345e232570b3a338 (diff) | |
| parent | 7d631aa0ffab875e4979727f632703ad5b4100a2 (diff) | |
| download | emacs-xwidget.tar.gz | |
merge masterxwidget
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 4 | ||||
| -rw-r--r-- | lisp/emulation/viper-keym.el | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index e41109a5619..bd03a870fdb 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -961,11 +961,11 @@ Suffixes such as .el or .elc should be stripped." (defun viper-ESC (arg) "Emulate ESC key in Emacs. Prevents multiple escape keystrokes if viper-no-multiple-ESC is true. -If viper-no-multiple-ESC is 'twice double ESC would ding in vi-state. +If `viper-no-multiple-ESC' is `twice' double ESC would ding in vi-state. Other ESC sequences are emulated via the current Emacs's major mode keymap. This is more convenient on TTYs, since this won't block function keys such as up, down, etc. ESC will also will also work as -a Meta key in this case. When viper-no-multiple-ESC is nil, ESC works +a Meta key in this case. When `viper-no-multiple-ESC' is nil, ESC works as a Meta key and any number of multiple escapes are allowed." (interactive "P") (let (char) diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 179ae169eca..250c292d72e 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -60,13 +60,13 @@ Full Vi compatibility is not recommended for power use of Viper." :group 'viper) (defcustom viper-no-multiple-ESC t - "If true, multiple ESC in Vi mode will cause bell to ring. -This is set to t on a windowing terminal and to 'twice on a dumb + "If non-nil, multiple ESC in Vi mode will cause bell to ring. +This is set to t on a windowing terminal and to `twice' on a dumb terminal (unless the user level is 1, 2, or 5). On a dumb terminal, this enables cursor keys and is generally more convenient, as terminals usually don't have a convenient Meta key. -Setting viper-no-multiple-ESC to nil will allow as many multiple ESC, -as is allowed by the major mode in effect." +Setting it to nil will allow as many multiple ESC, as is allowed by the +major mode in effect." :type 'boolean :group 'viper) |