From c5bb756916baa63cc663d68d4c24e5ad33a764e8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 27 Apr 2012 10:24:38 +0800 Subject: Fix for tool-bar confusion in read-key. * lisp/subr.el (read-key): Avoid running filter function when setting up temporary tool bar entries. Fixes: debbugs:9922 --- lisp/subr.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lisp/subr.el') diff --git a/lisp/subr.el b/lisp/subr.el index 3b120e6ff6a..9b293bb21ac 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -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) -- cgit v1.2.1