Mercurial > emacs
changeset 101227:c515c8daae0f
(org-mouse-show-context-menu): Use mouse-menu-major-mode-map, if
defined, rather than the obsolete mouse-major-mode-menu.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 16 Jan 2009 03:28:30 +0000 |
| parents | 63d9f73bf9d9 |
| children | b3adc9117711 |
| files | lisp/org/ChangeLog lisp/org/org-mouse.el |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/org/ChangeLog Fri Jan 16 03:26:29 2009 +0000 +++ b/lisp/org/ChangeLog Fri Jan 16 03:28:30 2009 +0000 @@ -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
--- a/lisp/org/org-mouse.el Fri Jan 16 03:26:29 2009 +0000 +++ b/lisp/org/org-mouse.el Fri Jan 16 03:28:30 2009 +0000 @@ -217,7 +217,10 @@ (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)))