(org-mouse-show-context-menu): Use mouse-menu-major-mode-map, if

defined, rather than the obsolete mouse-major-mode-menu.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 4c9d42bb2bac7052a0970c8f26564a06820e87e3..b2206cda0b1eeb683c8cb2315f98bd0af91e61d3 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-16  Glenn Morris  <rgm@gnu.org>
+
+       * org-mouse.el (org-mouse-show-context-menu): Use
+       mouse-menu-major-mode-map, if defined, rather than the obsolete
+       mouse-major-mode-menu.
+
 2008-12-23  Carsten Dominik  <dominik@science.uva.nl>
 
        * org-remember.el (org-remember-handler): Safer way to get a new

diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 279a81ad79e658aafdad4370995d6fc5465ec28d..1ae9f041a59becde48167726d08a336b799a8f66 100644 (file)
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -217,7 +217,10 @@ this function is called.  Otherwise, the current major mode menu is used."
            (sit-for 0)))
        (if (functionp org-mouse-context-menu-function)
            (funcall org-mouse-context-menu-function event)
-         (mouse-major-mode-menu event prefix)))
+         (if (fboundp 'mouse-menu-major-mode-map)
+             (popup-menu (mouse-menu-major-mode-map) event prefix)
+           (with-no-warnings ; don't warn about fallback, obsolete since 23.1
+             (mouse-major-mode-menu event prefix)))))
     (setq this-command 'mouse-save-then-kill)
     (mouse-save-then-kill event)))