2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55893760f36..e08a2f39efa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,10 @@
 
 2006-04-29  Richard Stallman  <rms@gnu.org>
 
+        * bindings.el (mode-line-major-mode-keymap): Move the major mode menu
+        to Mouse-3.
+        (help-echo): help-echo doc fixes.
+
         * net/tramp.el (tramp-file-name-handler-alist): Delete
         expand-file-name and other operations that can cause spurious loading.
 
diff --git a/lisp/bindings.el b/lisp/bindings.el
index aa3062b38e1..c2440d7f9a4 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -267,9 +267,8 @@ buffer size, the line number and the column number.")
 
 (defvar mode-line-major-mode-keymap
   (let ((map (make-sparse-keymap)))
-    (define-key map [mode-line down-mouse-1] 'mouse-major-mode-menu)
     (define-key map [mode-line mouse-2] 'describe-mode)
-    (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1)
+    (define-key map [mode-line down-mouse-3] 'mouse-major-mode-menu)
     map) "\
 Keymap to display on major mode.")
 
@@ -310,13 +309,13 @@ Keymap to display on minor modes.")
     (list
      (propertize "%[(" 'help-echo help-echo)
      `(:propertize ("" mode-name)
-                   help-echo "mouse-1: major-mode-menu mouse-2: help for current major mode"
+                   help-echo "mouse-2: help for major mode, mouse-3: major mode menu"
                    mouse-face mode-line-highlight
                    local-map ,mode-line-major-mode-keymap)
      '("" mode-line-process)
      `(:propertize ("" minor-mode-alist)
                    mouse-face mode-line-highlight
-                   help-echo "mouse-2: help for minor modes, mouse-3: minor mode menu"
+                   help-echo "mouse-2: help for minor mode, mouse-3: toggle minor modes"
                    local-map ,mode-line-minor-mode-keymap)
      (propertize "%n" 'help-echo "mouse-2: widen"
                  'mouse-face 'mode-line-highlight