mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

Fix M-x in Viper mode.

Browse Source 
* lisp/emulation/viper-cmd.el (viper-intercept-ESC-key): Fix
key-binding lookup for ESC key.

Fixes: debbugs:9146
This commit is contained in:
Chong Yidong 2012-02-27 21:14:36 +08:00
parent 431ee44bbe
commit ecf5f74e6b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ChangeLog
View File

@ -1,5 +1,8 @@
2012-02-27 Chong Yidong <cyd@gnu.org>
* emulation/viper-cmd.el (viper-intercept-ESC-key): Fix
key-binding lookup for ESC key (Bug#9146).
* font-lock.el (font-lock-specified-p): Rename from
font-lock-spec-present. Callers changed.

13
lisp/emulation/viper-cmd.el
View File

@ -1086,8 +1086,17 @@ as a Meta key and any number of multiple escapes are allowed."
(defun viper-intercept-ESC-key ()
"Function that implements ESC key in Viper emulation of Vi."
(interactive)
(let ((cmd (or (key-binding (viper-envelop-ESC-key))
(lambda () (interactive) (error "Viper bell")))))
;; `key-binding' needs to be called in a context where Viper's
;; minor-mode map(s) have been temporarily disabled so the ESC
;; binding to viper-intercept-ESC-key doesn't hide the binding we're
;; looking for (Bug#9146):
(let* ((event (viper-envelop-ESC-key))
(cmd (cond ((equal event viper-ESC-key)
'viper-intercept-ESC-key)
((let ((emulation-mode-map-alists nil))
(key-binding event)))
(t
(error "Viper bell")))))
;; call the actual function to execute ESC (if no other symbols followed)
;; or the key bound to the ESC sequence (if the sequence was issued