[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/bindings.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/bindings.el,v |
Date: |
Tue, 01 Apr 2008 07:56:14 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/04/01 07:56:13
Index: bindings.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/bindings.el,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -b -r1.203 -r1.204
--- bindings.el 29 Mar 2008 22:56:35 -0000 1.203
+++ bindings.el 1 Apr 2008 07:56:11 -0000 1.204
@@ -282,11 +282,14 @@
(defvar mode-line-modes nil
"Mode-line control for displaying major and minor modes.")
+(defvar mode-line-mode-menu (make-sparse-keymap "Minor Modes") "\
+Menu of mode operations in the mode line.")
+
(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] mode-line-mode-menu)
map) "\
Keymap to display on major mode.")
@@ -294,8 +297,8 @@
(let ((map (make-sparse-keymap)))
(define-key map [mode-line down-mouse-1] 'mouse-minor-mode-menu)
(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)
+ (define-key map [mode-line down-mouse-3] mode-line-mode-menu)
+ (define-key map [header-line down-mouse-3] mode-line-mode-menu)
map) "\
Keymap to display on minor modes.")
@@ -494,19 +497,6 @@
(select-window (posn-window (event-start event)))
(previous-buffer)))
-(defvar mode-line-mode-menu (make-sparse-keymap "Minor Modes") "\
-Menu of mode operations in the mode line.")
-
-(defun mode-line-mode-menu-1 (event)
- (interactive "e")
- (save-selected-window
- (select-window (posn-window (event-start event)))
- (let* ((selection (mode-line-mode-menu event))
- (binding (and selection (lookup-key mode-line-mode-menu
- (vector (car selection))))))
- (if binding
- (call-interactively binding)))))
-
(defmacro bound-and-true-p (var)
"Return the value of symbol VAR if it is bound, else nil."
`(and (boundp (quote ,var)) ,var))
@@ -560,10 +550,6 @@
:help "Automatically expand abbreviations"
:button (:toggle . abbrev-mode)))
-(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 on minor modes area of the mode line."
(interactive "@e")
- [Emacs-diffs] Changes to emacs/lisp/bindings.el,v,
Stefan Monnier <=