From: Stefan Monnier Date: Thu, 19 Aug 2010 14:37:31 +0000 (+0200) Subject: * lisp/subr.el (read-key): Don't hide the menu-bar entries. X-Git-Tag: emacs-pretest-23.2.90~139^2~13 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=186e86dbac28ca3bd9aa23cb6c8123f2b5ff919a;p=emacs.git * lisp/subr.el (read-key): Don't hide the menu-bar entries. Fixes: debbugs:6881 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 578f5e4fb49..83578620420 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,11 @@ +2010-08-19 Stefan Monnier + + * subr.el (read-key): Don't hide the menu-bar entries (bug#6881). + 2010-08-18 Michael Albinus - * progmodes/flymake.el (flymake-start-syntax-check-process): Use - `start-file-process' in order to let it run also on remote hosts. + * progmodes/flymake.el (flymake-start-syntax-check-process): + Use `start-file-process' in order to let it run also on remote hosts. 2010-08-18 Kenichi Handa @@ -41,10 +45,8 @@ 2010-08-06 Kenichi Handa - * international/mule.el (define-charset): Store NAME as :base - property. - (ctext-non-standard-encodings-table): Pay attention to charset - aliases. + * international/mule.el (define-charset): Store NAME as :base property. + (ctext-non-standard-encodings-table): Pay attention to charset aliases. (ctext-pre-write-conversion): Sort ctext-standard-encodings by the current priority. Force using the designation of the specific charset by adding `charset' text property. Improve the whole @@ -61,12 +63,12 @@ * language/cyrillic.el: Don't add "microsoft-cp1251" to ctext-non-standard-encodings-alist here. - * international/mule.el (ctext-non-standard-encodings-alist): Add - "koi8-r" and "microsoft-cp1251". + * international/mule.el (ctext-non-standard-encodings-alist): + Add "koi8-r" and "microsoft-cp1251". (ctext-standard-encodings): New variable. (ctext-non-standard-encodings-table): List only elements for non-standard encodings. - (ctext-pre-write-conversion): Adjusted for the above change. + (ctext-pre-write-conversion): Adjust for the above change. Check ctext-standard-encodings. * international/mule-conf.el (compound-text): Doc fix. diff --git a/lisp/subr.el b/lisp/subr.el index 44ae84ab76b..ad939dc6bb4 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1842,7 +1842,12 @@ some sort of escape sequence, the ambiguity is resolved via `read-key-delay'." (throw 'read-key keys))))))) (unwind-protect (progn - (use-global-map read-key-empty-map) + (use-global-map + (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])) + map)) (aref (catch 'read-key (read-key-sequence-vector prompt nil t)) 0)) (cancel-timer timer) (use-global-map old-global-map))))