andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for tool-bar confusion in read-key.

Browse source 
* lisp/subr.el (read-key): Avoid running filter function when setting
up temporary tool bar entries.

Fixes: debbugs:9922
This commit is contained in:
Chong Yidong 2012-04-27 10:24:38 +08:00
parent f2c3a9eb85
commit c5bb756916
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-27 Chong Yidong <cyd@gnu.org>
* subr.el (read-key): Avoid running filter function when setting
up temporary tool bar entries (Bug#9922).
2012-04-26 Andreas Schwab <schwab@linux-m68k.org>
* vc/vc-git.el (vc-git-state): Fix regexp matching diff output.

5
lisp/subr.el
View file

@ -2019,7 +2019,10 @@ some sort of escape sequence, the ambiguity is resolved via `read-key-delay'."
(let ((map (make-sparse-keymap)))
;; Don't hide the menu-bar and tool-bar entries.
(define-key map [menu-bar] (lookup-key global-map [menu-bar]))
(define-key map [tool-bar] (lookup-key global-map [tool-bar]))
(define-key map [tool-bar]
;; This hack avoids evaluating the :filter (Bug#9922).
(or (cdr (assq 'tool-bar global-map))
(lookup-key global-map [tool-bar])))
map))
(aref (catch 'read-key (read-key-sequence-vector prompt nil t)) 0))
(cancel-timer timer)