Mercurial > emacs
changeset 109937:9b8e40e0bf3c
* lisp/subr.el (read-key): Don't hide the menu-bar entries.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 19 Aug 2010 16:37:31 +0200 |
| parents | e1a5ebb1ce1c |
| children | a3faf2102c45 |
| files | .bzrignore lisp/ChangeLog lisp/subr.el |
| diffstat | 3 files changed, 18 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.bzrignore Thu Aug 19 01:32:39 2010 +0200 +++ b/.bzrignore Thu Aug 19 16:37:31 2010 +0200 @@ -69,3 +69,4 @@ core lib-src/stamp-* +* +lisp/vc
--- a/lisp/ChangeLog Thu Aug 19 01:32:39 2010 +0200 +++ b/lisp/ChangeLog Thu Aug 19 16:37:31 2010 +0200 @@ -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.
--- a/lisp/subr.el Thu Aug 19 01:32:39 2010 +0200 +++ b/lisp/subr.el Thu Aug 19 16:37:31 2010 +0200 @@ -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))))