diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-11-16 04:55:45 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-11-16 04:55:45 +0000 |
| commit | 42acc58182959fd891b5f4263d900c088de24c13 (patch) | |
| tree | 8a8dccc528efba870afea719b5e73551be776d34 /lisp/emulation/viper-init.el | |
| parent | 61c11870cc2f9e71e8c3608969b27afe323ce500 (diff) | |
| download | emacs-42acc58182959fd891b5f4263d900c088de24c13.tar.gz | |
2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-ESC-keyseq-timeout): Make it into a function
instead of a variable.
* viper-util.el (viper-fast-keysequence-p): Changed to use
viper-ESC-keyseq-timeout as a function.
(viper-get-saved-cursor-color-in-replace-mode): Use defun instead of
defsubst.
* viper-cmd.el: Let line-move-visual to nil when using next-line or
previous-line.
(viper-R-state-post-command-sentinel): Use defun instead of defsubst.
* viper-keym.el (viper-ESC-key): Use (kbd "ESC").
* ediff-util.el (ediff-toggle-multiframe): Check if control window is
live.
(ediff-save-buffer): Let window-min-height to 2.
* ediff-wind.el (ediff-setup-windows-plain-compare): Avoid selecting
the minibuffer.
Diffstat (limited to 'lisp/emulation/viper-init.el')
| -rw-r--r-- | lisp/emulation/viper-init.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index d8eaf253d16..9894ec8beda 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -525,15 +525,6 @@ will make it hard to use Vi-style timeout macros." :type 'integer :group 'viper-misc) -(defcustom viper-ESC-keyseq-timeout (if (viper-window-display-p) - 0 viper-fast-keyseq-timeout) - "*Key sequence beginning with ESC and separated by no more than this many milliseconds is considered to be generated by a keyboard function key. -Setting this too high may slow down switching from insert to vi state. Setting -this value too low will make it impossible to use function keys in insert mode -on a dumb terminal." - :type 'integer - :group 'viper-misc) - (defcustom viper-translate-all-ESC-keysequences (not (viper-window-display-p)) "Allow translation of all key sequences into commands. Normally, Viper lets Emacs translate only those ESC key sequences that are @@ -996,6 +987,15 @@ Should be set in `~/.viper' file." (set (make-local-variable 'bar-cursor) 2) (setq cursor-type '(bar . 2)))) +(defun viper-ESC-keyseq-timeout () + "*Key sequence beginning with ESC and separated by no more than this many milliseconds is considered to be generated by a keyboard function key. +Setting this too high may slow down switching from insert to vi state. Setting +this value too low will make it impossible to use function keys in insert mode +on a dumb terminal." + (if (viper-window-display-p) + 0 viper-fast-keyseq-timeout)) + + (provide 'viper-init) |