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

[Miles Bader]

Index: emacs/lisp/bindings.el
diff -c emacs/lisp/bindings.el:1.112 emacs/lisp/bindings.el:1.113
*** emacs/lisp/bindings.el:1.112        Sat Dec 21 15:19:37 2002
--- emacs/lisp/bindings.el      Mon Mar 31 15:24:56 2003
***************
*** 28,34 ****
  ;;; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  ;;; Special formatting conventions are used in this file!
  ;;;
! ;;; a backslash-newline is used at the beginning of a documentation string
  ;;; when that string should be stored in the file etc/DOCnnn, not in core.
  ;;;
  ;;; Such strings read into Lisp as numbers (during the pure-loading phase).
--- 28,34 ----
  ;;; !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  ;;; Special formatting conventions are used in this file!
  ;;;
! ;;; A backslash-newline is used at the beginning of a documentation string
  ;;; when that string should be stored in the file etc/DOCnnn, not in core.
  ;;;
  ;;; Such strings read into Lisp as numbers (during the pure-loading phase).
***************
*** 256,266 ****
  (defvar mode-line-modes nil
    "Mode-line control for displaying major and minor modes.")
  
  (defvar mode-line-minor-mode-keymap nil "\
! Keymap to display on major and minor modes.")
  
  ;; Menu of minor modes.
  (let ((map (make-sparse-keymap)))
    (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1)
    (define-key map [header-line down-mouse-3] 'mode-line-mode-menu-1)
    (setq mode-line-minor-mode-keymap map))
--- 256,274 ----
  (defvar mode-line-modes nil
    "Mode-line control for displaying major and minor modes.")
  
+ (defvar mode-line-major-mode-keymap nil "\
+ Keymap to display on major mode.")
+ 
  (defvar mode-line-minor-mode-keymap nil "\
! Keymap to display on minor modes.")
! 
! (let ((map (make-sparse-keymap)))
!   (define-key map [mode-line mouse-2] 'describe-mode)
!   (setq mode-line-major-mode-keymap map))
  
  ;; Menu of minor modes.
  (let ((map (make-sparse-keymap)))
+   (define-key map [mode-line mouse-2] 'mode-line-minor-mode-help)
    (define-key map [mode-line down-mouse-3] 'mode-line-mode-menu-1)
    (define-key map [header-line down-mouse-3] 'mode-line-mode-menu-1)
    (setq mode-line-minor-mode-keymap map))
***************
*** 292,299 ****
    (setq-default mode-line-modes
      (list
       (propertize "%[(" 'help-echo help-echo)
!      `(:propertize ("" mode-name mode-line-process minor-mode-alist)
!                  help-echo "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
--- 300,311 ----
    (setq-default mode-line-modes
      (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)
!      `(:propertize ("" 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
***************
*** 416,421 ****
--- 428,439 ----
  (defun mode-line-mode-menu (event)
    (interactive "@e")
    (x-popup-menu event mode-line-mode-menu))
+ 
+ (defun mode-line-minor-mode-help (event)
+   "Describe minor mode for EVENT occured on minor modes area of the mode 
line."
+   (interactive "@e")
+   (let ((indicator (car (nth 4 (car (cdr event))))))
+     (describe-minor-mode-from-indicator indicator)))
  
  ;; Add menu of buffer operations to the buffer identification part
  ;; of the mode line.or header line.