2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df2c734a341..19f5526a786 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mouse.el (minor-mode-menu-from-indicator): Pay attention
+        to :minor-mode-function (bug#4455).
+
 2009-09-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * startup.el (command-line): Initialize the window-system after
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 168a82e1742..dd3edbb13ae 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -158,7 +158,8 @@ items `Turn Off' and `Help'."
    (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 @@ items `Turn Off' and `Help'."
                 (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)