Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit c2da5e8c6611059bc750c50b36005002bf0a5709 1 parent 71eab14
@monnier monnier authored
Showing with 18 additions and 10 deletions.
  1. +1 −0  .bzrignore
  2. +11 −9 lisp/ChangeLog
  3. +6 −1 lisp/subr.el
View
1  .bzrignore
@@ -69,3 +69,4 @@ src/core
core
lib-src/stamp-*
+*
+lisp/vc
View
20 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.
View
7 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))))
Please sign in to comment.
Something went wrong with that request. Please try again.