diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-12-07 19:32:31 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-12-07 19:32:31 -0800 |
| commit | d5e6e0b6df0df7272d0595ab4ee4c372de966399 (patch) | |
| tree | afbe0e7b0854b7019ac241fb62281369b1afe519 | |
| parent | 3c1e62f86e7fb3369f19c7dd7dc895cff0f63bfb (diff) | |
| download | emacs-d5e6e0b6df0df7272d0595ab4ee4c372de966399.tar.gz | |
mouse.el fix for bug#7586.
* lisp/mouse.el (mouse-menu-major-mode-map, mouse-menu-bar-map):
Run hooks to update menu contents.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mouse.el | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c558723bdf..1805c06878e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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) diff --git a/lisp/mouse.el b/lisp/mouse.el index e88c2669714..243e7179678 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -181,6 +181,7 @@ items `Turn Off' and `Help'." (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 @@ Otherwise return the whole menu." "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 @@ choose a font." (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 |