diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-06-03 08:04:04 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2005-06-03 08:04:04 +0000 |
| commit | 899a431bae4a7b48a266c5da56610a5ea44febad (patch) | |
| tree | 38050620920c4ff4b5bd4dc2c4f3267dfe76eef2 /lisp/emulation/viper-keym.el | |
| parent | d06e384795d5ca4e82c88273847eeb9d01380046 (diff) | |
| download | emacs-899a431bae4a7b48a266c5da56610a5ea44febad.tar.gz | |
2005-06-03 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-diff.el (ediff-same-contents) Eliminate CL-type functions.
* ediff-mult.el (ediff-intersect-directories) Make sure that ".." and
"." files are deleted from all file lists before comparison
* viper-keym.el
(viper-toggle-key,viper-quoted-insert-key,viper-ESC-key):
Made them customizable.
* viper.el (viper-non-hook-settings): fixed the names of defadvices.
Diffstat (limited to 'lisp/emulation/viper-keym.el')
| -rw-r--r-- | lisp/emulation/viper-keym.el | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index a74ca05b3df..f14f67d94c8 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -50,16 +50,25 @@ ;;; Variables -(defvar viper-toggle-key "\C-z" +(defcustom viper-toggle-key "\C-z" "The key used to change states from emacs to Vi and back. In insert mode, this key also functions as Meta. Must be set in .viper file or prior to loading Viper. -This setting cannot be changed interactively.") +This setting cannot be changed interactively." + :type 'string + :group 'viper) + +(defcustom viper-quoted-insert-key "\C-v" + "The key used to quote special characters when inserting them in Insert state." + :type 'string + :group 'viper) -(defvar viper-ESC-key "\e" +(defcustom viper-ESC-key "\e" "Key used to ESC. Must be set in .viper file or prior to loading Viper. -This setting cannot be changed interactively.") +This setting cannot be changed interactively." + :type 'string + :group 'viper) ;;; Emacs keys in other states. @@ -242,7 +251,7 @@ viper-insert-basic-map. Not recommended, except for novice users.") (define-key viper-insert-basic-map "\C-t" 'viper-forward-indent) (define-key viper-insert-basic-map (if viper-xemacs-p [(shift tab)] [S-tab]) 'viper-insert-tab) -(define-key viper-insert-basic-map "\C-v" 'quoted-insert) +(define-key viper-insert-basic-map viper-quoted-insert-key 'quoted-insert) (define-key viper-insert-basic-map "\C-?" 'viper-del-backward-char-in-insert) (define-key viper-insert-basic-map [backspace] 'viper-del-backward-char-in-insert) (define-key viper-insert-basic-map "\C-\\" 'viper-alternate-Meta-key) |