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

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

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 4c9d42bb2ba..b2206cda0b1 100644
--- 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 279a81ad79e..1ae9f041a59 100644
--- 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)))