[Emacs-diffs] emacs/lisp/org ChangeLog org-mouse.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/01/16 03:28:30

Modified files:
        lisp/org       : ChangeLog org-mouse.el 

Log message:
        (org-mouse-show-context-menu): Use mouse-menu-major-mode-map, if
        defined, rather than the obsolete mouse-major-mode-menu.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/ChangeLog?cvsroot=emacs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-mouse.el?cvsroot=emacs&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- ChangeLog   5 Jan 2009 03:22:59 -0000       1.47
+++ ChangeLog   16 Jan 2009 03:28:30 -0000      1.48
@@ -1,3 +1,9 @@
+2009-01-16  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * org-remember.el (org-remember-handler): Safer way to get a new

Index: org-mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-mouse.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- org-mouse.el        5 Jan 2009 03:23:03 -0000       1.17
+++ org-mouse.el        16 Jan 2009 03:28:30 -0000      1.18
@@ -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)))