[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100286: mouse.el fix for bug#7586.

[Glenn Morris]

------------------------------------------------------------
revno: 100286
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-12-07 19:32:31 -0800
message:
  mouse.el fix for bug#7586.
  * lisp/mouse.el (mouse-menu-major-mode-map, mouse-menu-bar-map):
  Run hooks to update menu contents.
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-08 03:29:41 +0000
+++ b/lisp/ChangeLog    2010-12-08 03:32:31 +0000
@@ -1,5 +1,8 @@
 2010-12-08  Glenn Morris  <address@hidden>
 
+       * 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)
 

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2010-11-04 19:27:46 +0000
+++ b/lisp/mouse.el     2010-12-08 03:32:31 +0000
@@ -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