;;; buff-menu.el --- buffer menu main function and support functions.
-;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
;; This file is part of GNU Emacs.
;; along with GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;; Commentary:
+
+;; Edit, delete, or change attributes of all currently active Emacs
+;; buffers from a list summarizing their state. A good way to browse
+;; any special or scratch buffers you have loaded, since you can't find
+;; them by filename. The single entry point is `Buffer-menu-mode',
+;; normally bound to C-x C-b.
+
+;;; Change Log:
+
+;; Merged by esr with recent mods to Emacs 19 buff-menu, 23 Mar 1993
+;;
+;; Modified by Bob Weiner, Motorola, Inc., 4/14/89
+;;
+;; Added optional backup argument to 'Buffer-menu-unmark' to make it undelete
+;; current entry and then move to previous one.
+;;
+;; Based on FSF code dating back to 1985.
+
+;;; Code:
+
+;;;Not needed, now that q is now just quit and Buffer-menu-select is v.
+;;;(defvar Buffer-menu-window-config nil
+;;; "Window configuration saved from entry to `buffer-menu'.")
; Put buffer *Buffer List* into proper mode right away
; so that from now on even list-buffers is enough to get a buffer menu.
+(defvar Buffer-menu-buffer-column nil)
+
(defvar Buffer-menu-mode-map nil "")
(if Buffer-menu-mode-map
()
(setq Buffer-menu-mode-map (make-keymap))
(suppress-keymap Buffer-menu-mode-map t)
- (define-key Buffer-menu-mode-map "q" 'Buffer-menu-select)
+ (define-key Buffer-menu-mode-map "q" 'Buffer-menu-quit)
+ (define-key Buffer-menu-mode-map "v" 'Buffer-menu-select)
(define-key Buffer-menu-mode-map "2" 'Buffer-menu-2-window)
(define-key Buffer-menu-mode-map "1" 'Buffer-menu-1-window)
(define-key Buffer-menu-mode-map "f" 'Buffer-menu-this-window)
(define-key Buffer-menu-mode-map "?" 'describe-mode)
(define-key Buffer-menu-mode-map "u" 'Buffer-menu-unmark)
(define-key Buffer-menu-mode-map "m" 'Buffer-menu-mark)
- (define-key Buffer-menu-mode-map "t" 'Buffer-menu-visit-tags-table))
+ (define-key Buffer-menu-mode-map "t" 'Buffer-menu-visit-tags-table)
+ (define-key Buffer-menu-mode-map "%" 'Buffer-menu-toggle-read-only)
+ (define-key Buffer-menu-mode-map [mouse-2] 'Buffer-menu-mouse-select)
+)
;; Buffer Menu mode is suitable only for specially formatted data.
(put 'Buffer-menu-mode 'mode-class 'special)
Each line describes one of the buffers in Emacs.
Letters do not insert themselves; instead, they are commands.
\\<Buffer-menu-mode-map>
-\\[Buffer-menu-mark] -- mark buffer to be displayed.
-\\[Buffer-menu-select] -- select buffer of line point is on.
- Also show buffers marked with m in other windows.
-\\[Buffer-menu-1-window] -- select that buffer in full-screen window.
-\\[Buffer-menu-2-window] -- select that buffer in one window,
- together with buffer selected before this one in another window.
-\\[Buffer-menu-this-window] -- select that buffer in place of the buffer menu buffer.
+\\[Buffer-menu-mouse-select] -- select buffer you click on, in place of the buffer menu.
+\\[Buffer-menu-this-window] -- select current line's buffer in place of the buffer menu.
\\[Buffer-menu-other-window] -- select that buffer in another window,
so the buffer menu buffer remains visible in its window.
-\\[Buffer-menu-switch-other-window] -- switch the other window to this buffer.
+\\[Buffer-menu-switch-other-window] -- make another window display that buffer.
+\\[Buffer-menu-mark] -- mark current line's buffer to be displayed.
+\\[Buffer-menu-select] -- select current line's buffer.
+ Also show buffers marked with m, in other windows.
+\\[Buffer-menu-1-window] -- select that buffer in full-frame window.
+\\[Buffer-menu-2-window] -- select that buffer in one window,
+ together with buffer selected before this one in another window.
\\[Buffer-menu-visit-tags-table] -- visit-tags-table this buffer.
\\[Buffer-menu-not-modified] -- clear modified-flag on that buffer.
\\[Buffer-menu-save] -- mark that buffer to be saved, and move down.
\\[Buffer-menu-delete-backwards] -- mark that buffer to be deleted, and move up.
\\[Buffer-menu-execute] -- delete or save marked buffers.
\\[Buffer-menu-unmark] -- remove all kinds of marks from current line.
-\\[Buffer-menu-backup-unmark] -- back up a line and remove marks."
+ With prefix argument, also move up one line.
+\\[Buffer-menu-backup-unmark] -- back up a line and remove marks.
+\\[Buffer-menu-toggle-read-only] -- toggle read-only status of buffer on this line."
(kill-all-local-variables)
(use-local-map Buffer-menu-mode-map)
- (setq truncate-lines t)
- (setq buffer-read-only t)
(setq major-mode 'Buffer-menu-mode)
(setq mode-name "Buffer Menu")
+ (save-excursion
+ (goto-char (point-min))
+ (search-forward "Buffer")
+ (backward-word 1)
+ (setq Buffer-menu-buffer-column (current-column))
+ (forward-line 2)
+ (while (not (eobp))
+ (let ((where (Buffer-menu-buffer-name-position)))
+ (put-text-property (car where) (cdr where) 'mouse-face 'highlight))
+ (forward-line 1)))
+ (setq truncate-lines t)
+ (setq buffer-read-only t)
(run-hooks 'buffer-menu-mode-hook))
\f
-(defvar Buffer-menu-buffer-column 4)
-
(defun Buffer-menu-buffer (error-if-non-existent-p)
"Return buffer described by this line of buffer menu."
+ (let* ((where (Buffer-menu-buffer-name-position))
+ (string (buffer-substring (car where) (cdr where))))
+ (or (get-buffer string)
+ (if error-if-non-existent-p
+ (error "No buffer named \"%s\"" string)
+ nil))))
+
+;; Find the start and end positions of the buffer name on this line.
+;; Returns a cons (START . END).
+(defun Buffer-menu-buffer-name-position ()
(save-excursion
(beginning-of-line)
(forward-char Buffer-menu-buffer-column)
- (let ((start (point))
- string)
- ;; End of buffer name marked by tab or two spaces.
+ (let ((start (point)))
(re-search-forward "\t\\| ")
(skip-chars-backward " \t")
- (setq string (buffer-substring start (point)))
- (or (get-buffer string)
- (if error-if-non-existent-p
- (error "No buffer named \"%s\"" string)
- nil)))))
+ (cons start (point)))))
\f
(defun buffer-menu (&optional arg)
"Make a menu of buffers so you can save, delete or select them.
With argument, show only buffers that are visiting files.
Type ? after invocation to get help on commands available.
-Type q immediately to make the buffer menu go away."
+Type q immediately to make the buffer menu go away and to restore
+previous window configuration."
(interactive "P")
+;;; (setq Buffer-menu-window-config (current-window-configuration))
(list-buffers arg)
(pop-to-buffer "*Buffer List*")
(forward-line 2)
(message
- "Commands: d, s, x; 1, 2, m, u, q; delete; ~; ? for help."))
+ "Commands: d, s, x, u; f, o, 1, 2, m, v; ~, %%; q to quit; ? for help."))
+
+(defun Buffer-menu-quit ()
+ "Quit the buffer menu."
+ (interactive)
+ (let ((buffer (current-buffer)))
+ ;; Restore previous window configuration before displaying
+ ;; selected buffers.
+ (switch-to-buffer (other-buffer))
+ (bury-buffer buffer)))
(defun Buffer-menu-mark ()
"Mark buffer on this line for being displayed by \\<Buffer-menu-mode-map>\\[Buffer-menu-select] command."
(insert ?>)
(forward-line 1))))
-(defun Buffer-menu-unmark ()
- "Cancel all requested operations on buffer on this line."
- (interactive)
+(defun Buffer-menu-unmark (&optional backup)
+ "Cancel all requested operations on buffer on this line and move down.
+Optional ARG means move up."
+ (interactive "P")
(beginning-of-line)
(if (looking-at " [-M]")
(ding)
(buffer-read-only nil))
(delete-char 3)
(insert (if readonly (if mod " *%" " %") (if mod " * " " ")))))
- (forward-line 1))
+ (forward-line (if backup -1 1)))
(defun Buffer-menu-backup-unmark ()
"Move up and cancel all requested operations on buffer on line above."
(insert ?\ ))
(or (eq tem buff) (memq tem others) (setq others (cons tem others))))
(setq others (nreverse others)
- tem (/ (1- (screen-height)) (1+ (length others))))
+ tem (/ (1- (frame-height)) (1+ (length others))))
(delete-other-windows)
(switch-to-buffer buff)
(or (eq menu buff)
(bury-buffer menu))
- (while others
- (split-window nil tem)
- (other-window 1)
- (switch-to-buffer (car others))
- (setq others (cdr others)))
- (other-window 1))) ;back to the beginning!
+ (if (equal (length others) 0)
+ (progn
+;;; ;; Restore previous window configuration before displaying
+;;; ;; selected buffers.
+;;; (if Buffer-menu-window-config
+;;; (progn
+;;; (set-window-configuration Buffer-menu-window-config)
+;;; (setq Buffer-menu-window-config nil)))
+ (switch-to-buffer buff))
+ (while others
+ (split-window nil tem)
+ (other-window 1)
+ (switch-to-buffer (car others))
+ (setq others (cdr others)))
+ (other-window 1) ;back to the beginning!
+)))
+
\f
(defun Buffer-menu-visit-tags-table ()
"Visit the tags table in the buffer on this line. See `visit-tags-table'."
(error "Specified buffer has no file"))))
(defun Buffer-menu-1-window ()
- "Select this line's buffer, alone, in full screen."
+ "Select this line's buffer, alone, in full frame."
(interactive)
(switch-to-buffer (Buffer-menu-buffer t))
(bury-buffer (other-buffer))
(delete-other-windows))
+(defun Buffer-menu-mouse-select (event)
+ "Select the buffer whose line you click on."
+ (interactive "e")
+ (let (buffer)
+ (save-excursion
+ (set-buffer (window-buffer (posn-window (event-end event))))
+ (save-excursion
+ (goto-char (posn-point (event-end event)))
+ (setq buffer (Buffer-menu-buffer t))))
+ (select-window (posn-window (event-end event)))
+ (switch-to-buffer buffer)))
+
(defun Buffer-menu-this-window ()
"Select this line's buffer in this window."
(interactive)
(let ((buff (Buffer-menu-buffer t))
(menu (current-buffer))
(pop-up-windows t))
+ (delete-other-windows)
(switch-to-buffer (other-buffer))
(pop-to-buffer buff)
(bury-buffer menu)))
+(defun Buffer-menu-toggle-read-only ()
+ "Toggle read-only status of buffer on this line, perhaps via version control."
+ (interactive)
+ (let (char)
+ (save-excursion
+ (set-buffer (Buffer-menu-buffer t))
+ (vc-toggle-read-only)
+ (setq char (if buffer-read-only ?% ? )))
+ (save-excursion
+ (beginning-of-line)
+ (forward-char 2)
+ (if (/= (following-char) char)
+ (let (buffer-read-only)
+ (delete-char 1)
+ (insert char))))))
+
;;; buff-menu.el ends here