;;; buff-menu.el --- buffer menu main function and support functions.
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1987, 1993 Free Software Foundation, Inc.
-;; Author: Bob Weiner <rsw@cs.brown.edu>
;; Maintainer: FSF
-;; Adapted-by: Eric S. Raymond <esr@snark.thyrsus.com>
;; This file is part of GNU Emacs.
;;; Commentary:
;; Edit, delete, or change attributes of all currently active Emacs
-;; buffers from a list summarizing thir state. A good way to browse
+;; 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.
;; Merged by esr with recent mods to Emacs 19 buff-menu, 23 Mar 1993
;;
-;; Modified by Bob Weiner, Motorola, Inc., 3/1/89
-;;
-;; Save window configuration when 'buffer-menu' is called so that
-;; previous window configuration is restored. prior to selecting
-;; buffers.
-;; Made 'Buffer-menu-select' also perform a 'Buffer-menu-execute'.
-;;
;; Modified by Bob Weiner, Motorola, Inc., 4/14/89
;;
;; Added optional backup argument to 'Buffer-menu-unmark' to make it undelete
;;; Code:
-(defvar *buff-window-config* nil
- "Stores window configuration upon entry of 'buffer-menu'. Used to
-restore window configuration when only one buffer is selected.")
+;;;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 "m" 'Buffer-menu-mark)
(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.
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-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] -- 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-this-window] -- select that buffer in place of the buffer menu buffer.
-\\[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-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-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 nil)
-
-(defvar Buffer-menu-size-column nil)
-
(defun Buffer-menu-buffer (error-if-non-existent-p)
"Return buffer described by this line of buffer menu."
- (if (null Buffer-menu-buffer-column)
- (save-excursion
- (goto-char (point-min))
- (search-forward "Buffer")
- (backward-word 1)
- (setq Buffer-menu-buffer-column (current-column))
- (search-forward "Size")
- (backward-word 1)
- (setq Buffer-menu-size-column (current-column))))
+ (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.
Type q immediately to make the buffer menu go away and to restore
previous window configuration."
(interactive "P")
- (setq *buff-window-config* (current-window-configuration))
+;;; (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; delete; ~; q to quit; ? 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."
(or (eq tem buff) (memq tem others) (setq others (cons tem others))))
(setq others (nreverse others)
tem (/ (1- (frame-height)) (1+ (length others))))
- (Buffer-menu-execute)
(delete-other-windows)
(switch-to-buffer buff)
(or (eq menu buff)
(bury-buffer menu))
(if (equal (length others) 0)
(progn
- ;; Restore previous window configuration before displaying
- ;; selected buffers.
- (if *buff-window-config*
- (progn
- (set-window-configuration *buff-window-config*)
- (setq *buff-window-config* nil)))
+;;; ;; 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)
(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)
(bury-buffer menu)))
(defun Buffer-menu-toggle-read-only ()
- "Toggle read-only status of buffer on this line."
+ "Toggle read-only status of buffer on this line, perhaps via version control."
(interactive)
(let (char)
(save-excursion
(set-buffer (Buffer-menu-buffer t))
- (toggle-read-only)
+ (vc-toggle-read-only)
(setq char (if buffer-read-only ?% ? )))
(save-excursion
(beginning-of-line)