From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 9 Aug 2001 14:54:05 +0000 (+0000)
Subject: (define-minor-mode): Use
X-Git-Tag: emacs-pretest-21.0.105~229
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed771c89bc5cb0ce8140c05fb89188d92f3e9cc1;p=emacs.git

(define-minor-mode): Use
mode-line-minor-mode-keymap for the minor mode name.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65b628b059c..69c3c186a85 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,23 @@
 2001-08-09  Gerd Moellmann  <gerd@gnu.org>
 
+	* bindings.el (minor-mode-alist): Use mode-line-minor-mode-keymap
+	for the minor mode name.
+
+	* view.el (toplevel): Use mode-line-minor-mode-keymap for the
+	minor mode name.
+
+	* time.el (display-time-string-forms): Use
+	make-mode-line-mouse-map instead of make-mode-line-mouse2-map.
+
+	* subr.el (add-minor-mode): Use mode-line-minor-mode-keymap for
+	the minor mode name.
+
+	* emacs-lisp/easy-mmode.el (define-minor-mode): Use 
+	mode-line-minor-mode-keymap for the minor mode name.
+
+	* calendar/calendar.el (calendar-mode-line-format): Use
+	make-mode-line-mouse-map instead of make-mode-line-mouse2-map.
+
 	* bindings.el (make-mode-line-mouse-map): Renamed from
 	make-mode-line-mouse2-map.  Take additional arg MOUSE.
 	(mode-line-modified): Use mouse-3 instead of mouse-2.
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index bf7940c2218..0030600028d 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -1,6 +1,6 @@
 ;;; easy-mmode.el --- easy definition for major and minor modes
 
-;; Copyright (C) 1997,2000  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
@@ -135,11 +135,9 @@ BODY contains code that will be executed each time the mode is (dis)activated.
     (unless (or (not (stringp lighter)) (get-text-property 0 'local-map lighter)
 		(get-text-property 0 'keymap lighter))
       (setq lighter
-	    (apply 'propertize lighter
-		   'local-map (make-mode-line-mouse2-map mode)
-		   (unless (get-text-property 0 'help-echo lighter)
-		     (list 'help-echo
-			   (format "mouse-2: turn off %s" pretty-name))))))
+	    (propertize lighter
+			'local-map mode-line-minor-mode-keymap
+			'help-echo "mouse-3: minor mode menu")))
 
     `(progn
        ;; Define the variable to enable or disable the mode.