[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99988: * lisp/subr.el (read-key): Don't hide the menu-bar entries.

[Stefan Monnier]

------------------------------------------------------------
revno: 99988
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-08-19 16:37:31 +0200
message:
  * lisp/subr.el (read-key): Don't hide the menu-bar entries.
modified:
  .bzrignore
  lisp/ChangeLog
  lisp/subr.el

=== modified file '.bzrignore'
--- a/.bzrignore        2010-08-04 18:04:29 +0000
+++ b/.bzrignore        2010-08-19 14:37:31 +0000
@@ -69,3 +69,4 @@
 core
 lib-src/stamp-*
 +*
+lisp/vc

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-18 23:32:39 +0000
+++ b/lisp/ChangeLog    2010-08-19 14:37:31 +0000
@@ -1,7 +1,11 @@
+2010-08-19  Stefan Monnier  <address@hidden>
+
+       * subr.el (read-key): Don't hide the menu-bar entries (bug#6881).
+
 2010-08-18  Michael Albinus  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -41,10 +45,8 @@
 
 2010-08-06  Kenichi Handa  <address@hidden>
 
-       * 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.

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-08-11 13:43:49 +0000
+++ b/lisp/subr.el      2010-08-19 14:37:31 +0000
@@ -1842,7 +1842,12 @@
                       (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))))