diff options
author | Glenn Morris <rgm@gnu.org> | 2009-01-16 03:28:30 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2009-01-16 03:28:30 +0000 |
commit | 0e47efc5038ea4677b2fdc790f80680841d13951 (patch) | |
tree | bbfb8ae996153a87c4df60611c291f285f8db617 /lisp/org/org-mouse.el | |
parent | b60861e61fcb51c9cd07a446d97628ca344ef82c (diff) | |
download | emacs-0e47efc5038ea4677b2fdc790f80680841d13951.tar.gz |
(org-mouse-show-context-menu): Use mouse-menu-major-mode-map, if
defined, rather than the obsolete mouse-major-mode-menu.
Diffstat (limited to 'lisp/org/org-mouse.el')
-rw-r--r-- | lisp/org/org-mouse.el | 5 |
1 files changed, 4 insertions, 1 deletions
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))) |