aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1992-11-16 01:31:33 +0000
committerJim Blandy1992-11-16 01:31:33 +0000
commitee4b6d4c618a48c0bc301ba01dde89893f097713 (patch)
tree11e5ef0bce0fc22e5c85fe4b3dc38efa519555d4
parent4da495f314516b688ef0737e88bc7d0d0be30420 (diff)
downloademacs-ee4b6d4c618a48c0bc301ba01dde89893f097713.tar.gz
emacs-ee4b6d4c618a48c0bc301ba01dde89893f097713.zip
* bytecomp.el: Declare unread-command-char an obsolete variable.
* vip.el (vip-escape-to-emacs, vip-prefix-arg-value, vip-prefix-arg-com): Use unread-command-event instead of unread-command-char; respect its new semantics. * electric.el (Electric-command-loop): Same.
-rw-r--r--lisp/electric.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/electric.el b/lisp/electric.el
index a3626a007e5..acc002abaac 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -85,7 +85,7 @@
85 cmd this-command) 85 cmd this-command)
86 (if (or (prog1 quit-flag (setq quit-flag nil)) 86 (if (or (prog1 quit-flag (setq quit-flag nil))
87 (= last-input-char ?\C-g)) 87 (= last-input-char ?\C-g))
88 (progn (setq unread-command-char -1 88 (progn (setq unread-command-event nil
89 prefix-arg nil) 89 prefix-arg nil)
90 ;; If it wasn't cancelling a prefix character, then quit. 90 ;; If it wasn't cancelling a prefix character, then quit.
91 (if (or (= (length (this-command-keys)) 1) 91 (if (or (= (length (this-command-keys)) 1)
@@ -101,7 +101,7 @@
101 (setq last-command this-command) 101 (setq last-command this-command)
102 (if (or (prog1 quit-flag (setq quit-flag nil)) 102 (if (or (prog1 quit-flag (setq quit-flag nil))
103 (= last-input-char ?\C-g)) 103 (= last-input-char ?\C-g))
104 (progn (setq unread-command-char -1) 104 (progn (setq unread-command-event nil)
105 (if (not inhibit-quit) 105 (if (not inhibit-quit)
106 (progn (ding) 106 (progn (ding)
107 (message "Quit") 107 (message "Quit")