Mercurial > emacs
changeset 111923:df8c73722b0d
mouse.el fix for bug#7586.
* lisp/mouse.el (mouse-menu-major-mode-map, mouse-menu-bar-map):
Run hooks to update menu contents.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 07 Dec 2010 19:32:31 -0800 |
| parents | 16dda1d80ad4 |
| children | 0e0f4eb1091a |
| files | lisp/ChangeLog lisp/mouse.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Dec 07 19:29:41 2010 -0800 +++ b/lisp/ChangeLog Tue Dec 07 19:32:31 2010 -0800 @@ -1,5 +1,8 @@ 2010-12-08 Glenn Morris <rgm@gnu.org> + * mouse.el (mouse-menu-major-mode-map, mouse-menu-bar-map): + Run hooks to update menu contents. (Bug#7586) + * mail/smtpmail.el (smtpmail-send-it): Avoid colons in the queued file names, for the sake of MS Windows. (Bug#7588)
--- a/lisp/mouse.el Tue Dec 07 19:29:41 2010 -0800 +++ b/lisp/mouse.el Tue Dec 07 19:32:31 2010 -0800 @@ -181,6 +181,7 @@ (minor-mode-menu-from-indicator indicator))) (defun mouse-menu-major-mode-map () + (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) (let* (;; Keymap from which to inherit; may be null. (ancestor (mouse-menu-non-singleton (and (current-local-map) @@ -213,6 +214,7 @@ "Return a keymap equivalent to the menu bar. The contents are the items that would be in the menu bar whether or not it is actually displayed." + (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) (let* ((local-menu (and (current-local-map) (lookup-key (current-local-map) [menu-bar]))) (global-menu (lookup-key global-map [menu-bar])) @@ -2607,5 +2609,4 @@ (make-obsolete 'mldrag-drag-vertical-line 'mouse-drag-vertical-line "21.1") (provide 'mldrag) -;; arch-tag: 9a710ce1-914a-4923-9b81-697f7bf82ab3 ;;; mouse.el ends here