aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2009-01-15 15:12:32 +0000
committerDan Nicolaescu2009-01-15 15:12:32 +0000
commitfa9d0f3824ca79b4e9fc529af664d379f979f940 (patch)
treef92491dcb858d2f9dc142855528cc3382a884c60
parent84ef4ca220d8eb9e3b34991881a275f5a1658193 (diff)
downloademacs-fa9d0f3824ca79b4e9fc529af664d379f979f940.tar.gz
emacs-fa9d0f3824ca79b4e9fc529af664d379f979f940.zip
(Buffer-menu-mode): Derive from special-mode.
Refer to revert-buffer, not Buffer-menu-revert. (Buffer-menu-revert): Remove function, unused. (Buffer-menu-mode-map): Don't bind keys already bound by special-mode.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/buff-menu.el14
2 files changed, 10 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 512d2de278e..081844833a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12009-01-15 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * buff-menu.el (Buffer-menu-mode): Derive from special-mode.
4 Refer to revert-buffer, not Buffer-menu-revert.
5 (Buffer-menu-revert): Remove function, unused.
6 (Buffer-menu-mode-map): Don't bind keys already
7 bound by special-mode.
8
12009-01-15 Stephen Eglen <stephen@gnu.org> 92009-01-15 Stephen Eglen <stephen@gnu.org>
2 10
3 * emacs-lisp/lisp-mode.el (lisp-mode-variables): Doc fix. 11 * emacs-lisp/lisp-mode.el (lisp-mode-variables): Doc fix.
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 0cb23920526..f9975098b5a 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -120,7 +120,6 @@ Auto Revert Mode.")
120(defvar Buffer-menu-mode-map 120(defvar Buffer-menu-mode-map
121 (let ((map (make-keymap))) 121 (let ((map (make-keymap)))
122 (suppress-keymap map t) 122 (suppress-keymap map t)
123 (define-key map "q" 'quit-window)
124 (define-key map "v" 'Buffer-menu-select) 123 (define-key map "v" 'Buffer-menu-select)
125 (define-key map "2" 'Buffer-menu-2-window) 124 (define-key map "2" 'Buffer-menu-2-window)
126 (define-key map "1" 'Buffer-menu-1-window) 125 (define-key map "1" 'Buffer-menu-1-window)
@@ -140,13 +139,11 @@ Auto Revert Mode.")
140 (define-key map "p" 'previous-line) 139 (define-key map "p" 'previous-line)
141 (define-key map "\177" 'Buffer-menu-backup-unmark) 140 (define-key map "\177" 'Buffer-menu-backup-unmark)
142 (define-key map "~" 'Buffer-menu-not-modified) 141 (define-key map "~" 'Buffer-menu-not-modified)
143 (define-key map "?" 'describe-mode)
144 (define-key map "u" 'Buffer-menu-unmark) 142 (define-key map "u" 'Buffer-menu-unmark)
145 (define-key map "m" 'Buffer-menu-mark) 143 (define-key map "m" 'Buffer-menu-mark)
146 (define-key map "t" 'Buffer-menu-visit-tags-table) 144 (define-key map "t" 'Buffer-menu-visit-tags-table)
147 (define-key map "%" 'Buffer-menu-toggle-read-only) 145 (define-key map "%" 'Buffer-menu-toggle-read-only)
148 (define-key map "b" 'Buffer-menu-bury) 146 (define-key map "b" 'Buffer-menu-bury)
149 (define-key map "g" 'Buffer-menu-revert)
150 (define-key map "V" 'Buffer-menu-view) 147 (define-key map "V" 'Buffer-menu-view)
151 (define-key map "T" 'Buffer-menu-toggle-files-only) 148 (define-key map "T" 'Buffer-menu-toggle-files-only)
152 (define-key map [mouse-2] 'Buffer-menu-mouse-select) 149 (define-key map [mouse-2] 'Buffer-menu-mouse-select)
@@ -159,7 +156,7 @@ Auto Revert Mode.")
159;; Buffer Menu mode is suitable only for specially formatted data. 156;; Buffer Menu mode is suitable only for specially formatted data.
160(put 'Buffer-menu-mode 'mode-class 'special) 157(put 'Buffer-menu-mode 'mode-class 'special)
161 158
162(define-derived-mode Buffer-menu-mode nil "Buffer Menu" 159(define-derived-mode Buffer-menu-mode special-mode "Buffer Menu"
163 "Major mode for editing a list of buffers. 160 "Major mode for editing a list of buffers.
164Each line describes one of the buffers in Emacs. 161Each line describes one of the buffers in Emacs.
165Letters do not insert themselves; instead, they are commands. 162Letters do not insert themselves; instead, they are commands.
@@ -190,7 +187,7 @@ Letters do not insert themselves; instead, they are commands.
190 With prefix argument, also move up one line. 187 With prefix argument, also move up one line.
191\\[Buffer-menu-backup-unmark] -- back up a line and remove marks. 188\\[Buffer-menu-backup-unmark] -- back up a line and remove marks.
192\\[Buffer-menu-toggle-read-only] -- toggle read-only status of buffer on this line. 189\\[Buffer-menu-toggle-read-only] -- toggle read-only status of buffer on this line.
193\\[Buffer-menu-revert] -- update the list of buffers. 190\\[revert-buffer] -- update the list of buffers.
194\\[Buffer-menu-toggle-files-only] -- toggle whether the menu displays only file buffers. 191\\[Buffer-menu-toggle-files-only] -- toggle whether the menu displays only file buffers.
195\\[Buffer-menu-bury] -- bury the buffer listed on this line." 192\\[Buffer-menu-bury] -- bury the buffer listed on this line."
196 (set (make-local-variable 'revert-buffer-function) 193 (set (make-local-variable 'revert-buffer-function)
@@ -203,13 +200,6 @@ Letters do not insert themselves; instead, they are commands.
203(define-obsolete-variable-alias 'buffer-menu-mode-hook 200(define-obsolete-variable-alias 'buffer-menu-mode-hook
204 'Buffer-menu-mode-hook "23.1") 201 'Buffer-menu-mode-hook "23.1")
205 202
206;; This function exists so we can make the doc string of Buffer-menu-mode
207;; look nice.
208(defun Buffer-menu-revert ()
209 "Update the list of buffers."
210 (interactive)
211 (revert-buffer))
212
213(defun Buffer-menu-revert-function (ignore1 ignore2) 203(defun Buffer-menu-revert-function (ignore1 ignore2)
214 (or (eq buffer-undo-list t) 204 (or (eq buffer-undo-list t)
215 (setq buffer-undo-list nil)) 205 (setq buffer-undo-list nil))