* lisp/subr.el (read-key): Don't hide the menu-bar entries.

Fixes: debbugs:6881

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 578f5e4fb49df4297ed7bad2315dcf77ac7268bf..8357862042086cc3d44754cc7f7885e4ef76ed34 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,11 @@
+2010-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * subr.el (read-key): Don't hide the menu-bar entries (bug#6881).
+
 2010-08-18  Michael Albinus  <michael.albinus@gmx.de>
 
-       * 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  <handa@m17n.org>
 
@@ -41,10 +45,8 @@
 
 2010-08-06  Kenichi Handa  <handa@m17n.org>
 
-       * 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 44ae84ab76bcef2da67c1d40850311910b5be4f9..ad939dc6bb45089df17d4e5fe4c3ee5b93133cc4 100644 (file)
--- 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))))