diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-04-27 11:10:38 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-04-27 11:10:38 +0800 |
| commit | a8e7d6d783219972c08fd49a3a2afaf26eb139c2 (patch) | |
| tree | 5e86d23d9285389791dc8321d8a8a2ece2247bea /lisp/subr.el | |
| parent | b360839071ef6c7a9e917fe57a4aaeb39138e8c0 (diff) | |
| parent | c5bb756916baa63cc663d68d4c24e5ad33a764e8 (diff) | |
| download | emacs-a8e7d6d783219972c08fd49a3a2afaf26eb139c2.tar.gz | |
Merge changes from emacs-24 branch
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 2404f6a56d2..b548f82ca5a 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2023,7 +2023,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) |