[Emacs-diffs] Changes to emacs/lisp/bindings.el

[Masatake YAMATO]

Index: emacs/lisp/bindings.el
diff -c emacs/lisp/bindings.el:1.145 emacs/lisp/bindings.el:1.146
*** emacs/lisp/bindings.el:1.145        Thu Apr 21 00:06:54 2005
--- emacs/lisp/bindings.el      Mon May 23 11:19:17 2005
***************
*** 165,171 ****
             (eval-when-compile
               (let ((map (make-sparse-keymap)))
                 (define-key map [mode-line mouse-3] 'mode-line-change-eol)
!                map))))
        (push (cons eol (cons mnemonic desc)) mode-line-eol-desc-cache)
        desc)))
  
--- 165,172 ----
             (eval-when-compile
               (let ((map (make-sparse-keymap)))
                 (define-key map [mode-line mouse-3] 'mode-line-change-eol)
!                map))
!            'mouse-face 'mode-line-highlight))
        (push (cons eol (cons mnemonic desc)) mode-line-eol-desc-cache)
        desc)))
  
***************
*** 177,183 ****
                             "Input method: "
                             current-input-method
                             ".  mouse-2: disable, mouse-3: describe")
!                 local-map ,mode-line-input-method-map))
      ,(propertize
        "%z"
        'help-echo
--- 178,185 ----
                             "Input method: "
                             current-input-method
                             ".  mouse-2: disable, mouse-3: describe")
!                 local-map ,mode-line-input-method-map
!                 mouse-face mode-line-highlight))
      ,(propertize
        "%z"
        'help-echo
***************
*** 191,196 ****
--- 193,199 ----
                          " buffer; mouse-3: describe coding system")
                (concat "Unibyte " (symbol-name buffer-file-coding-system)
                        " buffer")))))
+       'mouse-face 'mode-line-highlight
        'local-map mode-line-coding-system-map)
      (:eval (mode-line-eol-desc)))
    "Mode-line control for displaying information of multilingual environment.
***************
*** 235,241 ****
                                            "Not r")))))
         'local-map (purecopy (make-mode-line-mouse-map
                               'mouse-3
!                              #'mode-line-toggle-read-only)))
        (propertize
         "%1+"
         'help-echo  (purecopy (lambda (window object point)
--- 238,245 ----
                                            "Not r")))))
         'local-map (purecopy (make-mode-line-mouse-map
                               'mouse-3
!                              #'mode-line-toggle-read-only))
!        'mouse-face 'mode-line-highlight)
        (propertize
         "%1+"
         'help-echo  (purecopy (lambda (window object point)
***************
*** 246,252 ****
                                             "M"
                                           "Not m")))))
         'local-map (purecopy (make-mode-line-mouse-map
!                              'mouse-3 #'mode-line-toggle-modified))))
    "Mode-line control for displaying whether current buffer is modified.")
  
  (make-variable-buffer-local 'mode-line-modified)
--- 250,257 ----
                                             "M"
                                           "Not m")))))
         'local-map (purecopy (make-mode-line-mouse-map
!                              'mouse-3 #'mode-line-toggle-modified))
!        'mouse-face 'mode-line-highlight))
    "Mode-line control for displaying whether current buffer is modified.")
  
  (make-variable-buffer-local 'mode-line-modified)
***************
*** 262,267 ****
--- 267,273 ----
  
  (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)
      map) "\
***************
*** 303,315 ****
      (list
       (propertize "%[(" 'help-echo help-echo)
       `(:propertize ("" mode-name)
!                  help-echo "mouse-2: help for current major mode"
                   local-map ,mode-line-major-mode-keymap)
       '("" mode-line-process)
       `(:propertize ("" minor-mode-alist)
                   help-echo "mouse-2: help for minor modes, mouse-3: minor 
mode menu"
                   local-map ,mode-line-minor-mode-keymap)
       (propertize "%n" 'help-echo "mouse-2: widen"
                 'local-map (make-mode-line-mouse-map
                             'mouse-2 #'mode-line-widen))
       (propertize ")%]--" 'help-echo help-echo)))
--- 309,324 ----
      (list
       (propertize "%[(" 'help-echo help-echo)
       `(:propertize ("" mode-name)
!                  help-echo "mouse-1: major-mode-menu mouse-2: help for 
current major mode"
!                  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"
                   local-map ,mode-line-minor-mode-keymap)
       (propertize "%n" 'help-echo "mouse-2: widen"
+                'mouse-face 'mode-line-highlight
                 'local-map (make-mode-line-mouse-map
                             'mouse-2 #'mode-line-widen))
       (propertize ")%]--" 'help-echo help-echo)))
***************
*** 465,470 ****
--- 474,480 ----
                    'face 'Buffer-menu-buffer-face
                    'help-echo
                    (purecopy "mouse-1: previous buffer, mouse-3: next buffer")
+                   'mouse-face 'mode-line-highlight
                    'local-map mode-line-buffer-identification-keymap)))
  
  (setq-default mode-line-buffer-identification