2008-11-22 Michael Kifer <kifer@cs.stonybrook.edu>

	* viper.el: date change.

	* viper-cmd.el (viper-envelop-ESC-key):
	viper-translate-all-ESC-keysequences is now a function.

	* viper-init (viper-translate-all-ESC-keysequences): make this variable

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4457b02305cf5812bac68d0d9806f16888b44d0..45ce93ecde121378d7925d78a58bd21af472cafe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-22  Michael Kifer  <kifer@cs.stonybrook.edu>
+       
+       * viper.el: date change.
+       
+       * viper-cmd.el (viper-envelop-ESC-key):
+       viper-translate-all-ESC-keysequences is now a function.
+       
+       * viper-init (viper-translate-all-ESC-keysequences): make this variable
+       
 2008-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc-hooks.el (vc-follow-link, vc-find-file-hook):

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index a6e7339e9fcff5bb0a04aacb3f3946d13c1bd358..4b5fc4b7bdeb052e907ef9557c38e82d4f9d0dbd 100644 (file)
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1046,7 +1046,7 @@ as a Meta key and any number of multiple escapes is allowed."
                (let* ((first-key (elt keyseq 0))
                       (key-mod (event-modifiers first-key)))
                  (cond ((and (viper-ESC-event-p first-key)
-                             (not viper-translate-all-ESC-keysequences))
+                             (not (viper-translate-all-ESC-keysequences)))
                         ;; put keys following ESC on the unread list
                         ;; and return ESC as the key-sequence
                         (viper-set-unread-command-events (viper-subseq keyseq 1))

diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 9894ec8bedac377f3b0942a33e9abab39eedb848..856f8e7a33f129a7f16518efc4da421c176478bf 100644 (file)
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -525,18 +525,10 @@ will make it hard to use Vi-style timeout macros."
   :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
-defined in the low-level key-translation-map or function-key-map, such as those
-emitted by the arrow and function keys. Other sequences, e.g., \\e/, are
-treated as ESC command followed by a `/'. This is done for people who type fast
-and tend to hit other characters right after they hit ESC. Other people like
-Emacs to translate ESC sequences all the time.
-The default is to translate all sequences only when using a dumb terminal.
-This permits you to use ESC as a meta key in insert mode."
-  :type 'boolean
-  :group 'viper-misc)
+;; This function determines if ESC key sequences are to be translated into
+;; commands.
+(defun viper-translate-all-ESC-keysequences ()
+  (not (viper-window-display-p)))
 
 ;; Modes and related variables
 

diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 25d7af90e380aef4527e176eda160b77e782293c..36420a2b1b87c9653b46b0ad689610f52bc7bcf9 100644 (file)
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -14,7 +14,7 @@
 ;; filed in the Emacs bug reporting system against this file, a copy
 ;; of the bug report be sent to the maintainer's email address.
 
-(defconst viper-version "3.14 of November 16, 2008"
+(defconst viper-version "3.14 of November 22, 2008"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.