From a8b7149d7e0b03f9fca1898592f2dd6185ccfbcd Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 11 Sep 2006 07:11:21 +0000 Subject: [PATCH] (mode-line-buffer-identification-keymap): Move initialization into declaration. --- lisp/ChangeLog | 9 +++++++-- lisp/bindings.el | 30 ++++++++++++++---------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 025e09475da..ac3a50c921e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-09-11 Stefan Monnier + + * bindings.el (mode-line-buffer-identification-keymap): + Move initialization into declaration. + 2006-09-10 Kim F. Storm * ido.el (ido-edit-input, ido-complete, ido-take-first-match) @@ -30,8 +35,8 @@ 2006-09-09 Richard Stallman - * textmodes/conf-mode.el (conf-space-mode): Use - hack-local-variables-hook instead of calling hack-local-variables. + * textmodes/conf-mode.el (conf-space-mode): + Use hack-local-variables-hook instead of calling hack-local-variables. (conf-space-keywords-override): New variable. (conf-space-mode-internal): New subroutine. Reinit Font Lock mode. (conf-space-mode): Always make conf-space-keywords and diff --git a/lisp/bindings.el b/lisp/bindings.el index 65ff8b0f916..4100a4d0df4 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -337,24 +337,22 @@ Keymap to display on minor modes.") (put 'mode-line-position 'standard-value (list `(quote ,standard-mode-line-position)))) -(defvar mode-line-buffer-identification-keymap nil "\ +(defvar mode-line-buffer-identification-keymap + ;; Add menu of buffer operations to the buffer identification part + ;; of the mode line.or header line. + (let ((map (make-sparse-keymap))) + ;; Bind down- events so that the global keymap won't ``shine + ;; through''. + (define-key map [mode-line mouse-1] 'mode-line-previous-buffer) + (define-key map [header-line down-mouse-1] 'ignore) + (define-key map [header-line mouse-1] 'mode-line-previous-buffer) + (define-key map [header-line down-mouse-3] 'ignore) + (define-key map [mode-line mouse-3] 'mode-line-next-buffer) + (define-key map [header-line down-mouse-3] 'ignore) + (define-key map [header-line mouse-3] 'mode-line-next-buffer) + map) "\ Keymap for what is displayed by `mode-line-buffer-identification'.") -;; Add menu of buffer operations to the buffer identification part -;; of the mode line.or header line. -; -(let ((map (make-sparse-keymap))) - ;; Bind down- events so that the global keymap won't ``shine - ;; through''. - (define-key map [mode-line mouse-1] 'mode-line-previous-buffer) - (define-key map [header-line down-mouse-1] 'ignore) - (define-key map [header-line mouse-1] 'mode-line-previous-buffer) - (define-key map [header-line down-mouse-3] 'ignore) - (define-key map [mode-line mouse-3] 'mode-line-next-buffer) - (define-key map [header-line down-mouse-3] 'ignore) - (define-key map [header-line mouse-3] 'mode-line-next-buffer) - (setq mode-line-buffer-identification-keymap map)) - (defun propertized-buffer-identification (fmt) "Return a list suitable for `mode-line-buffer-identification'. FMT is a format specifier such as \"%12b\". This function adds -- 2.39.2