aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kifer2001-09-14 03:34:31 +0000
committerMichael Kifer2001-09-14 03:34:31 +0000
commit483e0218fe1acdac8ca03ce6c2e6498d3e859ab8 (patch)
treef2abe6bbb946e207ab676e7137f5c47f4718a245
parent739a80b3f1ea0e84ba3773b7aa9acc3172993d1d (diff)
downloademacs-483e0218fe1acdac8ca03ce6c2e6498d3e859ab8.tar.gz
emacs-483e0218fe1acdac8ca03ce6c2e6498d3e859ab8.zip
2001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-replace-char-subr, viper-envelop-ESC-key): inhibit quit.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emulation/viper-cmd.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f45f8e17f66..b4b265337c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-09-13 Michael Kifer <kifer@cs.sunysb.edu>
2
3 * viper-cmd.el (viper-replace-char-subr, viper-envelop-ESC-key):
4 inhibit quit.
5
12001-09-13 Eli Zaretskii <eliz@is.elta.co.il> 62001-09-13 Eli Zaretskii <eliz@is.elta.co.il>
2 7
3 * files.el (make-auto-save-file-name): If long file names are not 8 * files.el (make-auto-save-file-name): If long file names are not
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index a7bfb3bd2b4..f7f2e3f853d 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -950,7 +950,7 @@ as a Meta key and any number of multiple escapes is allowed."
950(defun viper-envelop-ESC-key () 950(defun viper-envelop-ESC-key ()
951 (let ((event last-input-event) 951 (let ((event last-input-event)
952 (keyseq [nil]) 952 (keyseq [nil])
953 inhibit-quit) 953 (inhibit-quit t))
954 (if (viper-ESC-event-p event) 954 (if (viper-ESC-event-p event)
955 (progn 955 (progn
956 (if (viper-fast-keysequence-p) 956 (if (viper-fast-keysequence-p)
@@ -2548,7 +2548,8 @@ These keys are ESC, RET, and LineFeed"
2548 )) 2548 ))
2549 2549
2550(defun viper-replace-char-subr (com arg) 2550(defun viper-replace-char-subr (com arg)
2551 (let (char inhibit-quit) 2551 (let ((inhibit-quit t)
2552 char)
2552 (viper-set-complex-command-for-undo) 2553 (viper-set-complex-command-for-undo)
2553 (or (eq viper-intermediate-command 'viper-repeat) 2554 (or (eq viper-intermediate-command 'viper-repeat)
2554 (viper-special-read-and-insert-char)) 2555 (viper-special-read-and-insert-char))