[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog mouse.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog mouse.el |
Date: |
Thu, 17 Sep 2009 01:33:01 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 09/09/17 01:33:00
Modified files:
lisp : ChangeLog mouse.el
Log message:
(minor-mode-menu-from-indicator): Pay attention
to :minor-mode-function (bug#4455).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16183&r2=1.16184
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mouse.el?cvsroot=emacs&r1=1.357&r2=1.358
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16183
retrieving revision 1.16184
diff -u -b -r1.16183 -r1.16184
--- ChangeLog 16 Sep 2009 17:54:13 -0000 1.16183
+++ ChangeLog 17 Sep 2009 01:32:56 -0000 1.16184
@@ -1,3 +1,8 @@
+2009-09-17 Stefan Monnier <address@hidden>
+
+ * mouse.el (minor-mode-menu-from-indicator): Pay attention
+ to :minor-mode-function (bug#4455).
+
2009-09-16 Stefan Monnier <address@hidden>
* startup.el (command-line): Initialize the window-system after
Index: mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mouse.el,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -b -r1.357 -r1.358
--- mouse.el 17 Jul 2009 23:27:28 -0000 1.357
+++ mouse.el 17 Sep 2009 01:33:00 -0000 1.358
@@ -158,7 +158,8 @@
(list (completing-read
"Minor mode indicator: "
(describe-minor-mode-completion-table-for-indicator))))
- (let ((minor-mode (lookup-minor-mode-from-indicator indicator)))
+ (let* ((minor-mode (lookup-minor-mode-from-indicator indicator))
+ (mm-fun (or (get minor-mode :minor-mode-function) minor-mode)))
(unless minor-mode (error "Cannot find minor mode for `%s'" indicator))
(let* ((map (cdr-safe (assq minor-mode minor-mode-map-alist)))
(menu (and (keymapp map) (lookup-key map [menu-bar]))))
@@ -167,10 +168,10 @@
(mouse-menu-non-singleton menu)
`(keymap
,indicator
- (turn-off menu-item "Turn Off minor mode" ,minor-mode)
+ (turn-off menu-item "Turn Off minor mode" ,mm-fun)
(help menu-item "Help for minor mode"
(lambda () (interactive)
- (describe-function ',minor-mode))))))
+ (describe-function ',mm-fun))))))
(popup-menu menu))))
(defun mouse-minor-mode-menu (event)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog mouse.el,
Stefan Monnier <=