;;; buff-menu.el --- buffer menu main function and support functions.
-;; Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 87, 93, 94, 95 Free Software Foundation, Inc.
;; Maintainer: FSF
;;; Code:
-;;;Not needed, now that q is now just quit and Buffer-menu-select is v.
+;;;Trying to preserve the old window configuration works well in
+;;;simple scenarios, when you enter the buffer menu, use it, and exit it.
+;;;But it does strange things when you switch back to the buffer list buffer
+;;;with C-x b, later on, when the window configuration is different.
+;;;The choice seems to be, either restore the window configuration
+;;;in all cases, or in no cases.
+;;;I decided it was better not to restore the window config at all. -- rms.
+
+;;;But since then, I changed buffer-menu to use the selected window,
+;;;so q now once again goes back to the previous window configuration.
+
;;;(defvar Buffer-menu-window-config nil
;;; "Window configuration saved from entry to `buffer-menu'.")
(use-local-map Buffer-menu-mode-map)
(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)))
(make-local-variable 'revert-buffer-function)
(setq revert-buffer-function 'Buffer-menu-revert-function)
(setq truncate-lines t)
\f
(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))))
- (set-text-properties 0 (length string) nil string)
- (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)))
- (re-search-forward "\t\\| ")
- (skip-chars-backward " \t")
- (cons start (point)))))
+ (let* ((where (save-excursion
+ (beginning-of-line)
+ (+ (point) Buffer-menu-buffer-column)))
+ (name (and (not (eobp)) (get-text-property where 'buffer-name))))
+ (if name
+ (or (get-buffer name)
+ (if error-if-non-existent-p
+ (error "No buffer named `%s'" name)
+ nil))
+ (if error-if-non-existent-p
+ (error "No buffer on this line")
+ nil))))
\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 and to restore
-previous window configuration."
+Type q immediately to make the buffer menu go away."
+ (interactive "P")
+;;; (setq Buffer-menu-window-config (current-window-configuration))
+ (switch-to-buffer (list-buffers-noselect arg))
+ (message
+ "Commands: d, s, x, u; f, o, 1, 2, m, v; ~, %%; q to quit; ? for help."))
+
+(defun buffer-menu-other-window (&optional arg)
+ "Display a list of buffers in another window.
+With the buffer list buffer, you can save, delete or select the buffers.
+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."
(interactive "P")
;;; (setq Buffer-menu-window-config (current-window-configuration))
- (list-buffers arg)
- (let ((newpoint (save-excursion (set-buffer "*Buffer List*")
- (point))))
- (pop-to-buffer "*Buffer List*")
- (goto-char newpoint))
+ (switch-to-buffer-other-window (list-buffers-noselect arg))
(message
"Commands: d, s, x, u; f, o, 1, 2, m, v; ~, %%; q to quit; ? for help."))
"Quit the buffer menu."
(interactive)
(let ((buffer (current-buffer)))
- ;; Restore previous window configuration before displaying
- ;; selected buffers.
+ ;; Switch away from the buffer menu and bury it.
(switch-to-buffer (other-buffer))
(bury-buffer buffer)))
"Mark buffer on this line to be saved by \\<Buffer-menu-mode-map>\\[Buffer-menu-execute] command."
(interactive)
(beginning-of-line)
- (forward-char 1)
(if (looking-at " [-M]") ;header lines
(ding)
(let ((buffer-read-only nil))
+ (forward-char 1)
(delete-char 1)
(insert ?S)
(forward-line 1))))
(defun Buffer-menu-select ()
"Select this line's buffer; also display buffers marked with `>'.
-You can mark buffers with the \\<Buffer-menu-mode-map>\\[Buffer-menu-mark] command."
+You can mark buffers with the \\<Buffer-menu-mode-map>\\[Buffer-menu-mark] command.
+This command deletes and replaces all the previously existing windows
+in the selected frame."
(interactive)
(let ((buff (Buffer-menu-buffer t))
(menu (current-buffer))
(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'."
The M column contains a * for buffers that are modified.
The R column contains a % for buffers that are read-only."
(interactive "P")
+ (display-buffer (list-buffers-noselect files-only)))
+
+(defun list-buffers-noselect (&optional files-only)
+ "Create and return a buffer with a list of names of existing buffers.
+The buffer is named `*Buffer List*'.
+Note that buffers with names starting with spaces are omitted.
+Non-null optional arg FILES-ONLY means mention only file buffers.
+
+The M column contains a * for buffers that are modified.
+The R column contains a % for buffers that are read-only."
(let ((old-buffer (current-buffer))
- (blist-buffer (get-buffer-create "*Buffer List*"))
- (desired-point nil))
- (with-output-to-temp-buffer "*Buffer List*"
- (set-buffer standard-output)
+ (standard-output standard-output)
+ desired-point)
+ (save-excursion
+ (set-buffer (get-buffer-create "*Buffer List*"))
+ (setq buffer-read-only nil)
+ (erase-buffer)
+ (setq standard-output (current-buffer))
(princ "\
MR Buffer Size Mode File
-- ------ ---- ---- ----
")
+ ;; Record the column where buffer names start.
+ (setq Buffer-menu-buffer-column 4)
(let ((bl (buffer-list)))
(while bl
(let* ((buffer (car bl))
(name (buffer-name buffer))
- (file (buffer-file-name buffer)))
+ (file (buffer-file-name buffer))
+ this-buffer-line-start
+ this-buffer-read-only
+ this-buffer-size
+ this-buffer-mode-name
+ this-buffer-directory)
+ (save-excursion
+ (set-buffer buffer)
+ (setq this-buffer-read-only buffer-read-only)
+ (setq this-buffer-size (buffer-size))
+ (setq this-buffer-mode-name
+ (if (eq buffer standard-output)
+ "Buffer Menu" mode-name))
+ (or file
+ ;; No visited file. Check local value of
+ ;; list-buffers-directory.
+ (if (and (boundp 'list-buffers-directory)
+ list-buffers-directory)
+ (setq this-buffer-directory list-buffers-directory))))
(cond
;; Don't mention internal buffers.
((string= (substring name 0 1) " "))
((and files-only (not file)))
;; Otherwise output info.
(t
+ (setq this-buffer-line-start (point))
;; Identify current buffer.
(if (eq buffer old-buffer)
(progn
;; Identify modified buffers.
(princ (if (buffer-modified-p buffer) "*" " "))
;; Handle readonly status. The output buffer is special
- ;; cased to be readonly; it is actually made so at a later
+ ;; cased to appear readonly; it is actually made so at a later
;; date.
- (princ (if (or (eq buffer standard-output) buffer-read-only)
+ (princ (if (or (eq buffer standard-output)
+ this-buffer-read-only)
"% "
" "))
(princ name)
- (indent-to 17 2)
+ ;; Put the buffer name into a text property
+ ;; so we don't have to extract it from the text.
+ ;; This way we avoid problems with unusual buffer names.
+ (setq this-buffer-line-start
+ (+ this-buffer-line-start Buffer-menu-buffer-column))
+ (let ((name-end (point)))
+ (indent-to 17 2)
+ (put-text-property this-buffer-line-start name-end
+ 'buffer-name name)
+ (put-text-property this-buffer-line-start name-end
+ 'mouse-face 'highlight))
(let (size
mode
(excess (- (current-column) 17)))
- (save-excursion
- (set-buffer buffer)
- (setq size (format "%8d" (buffer-size)))
- ;; Ack -- if looking at the *Buffer List* buffer,
- ;; always use "Buffer Menu" mode. Otherwise the
- ;; first time the buffer is created, the mode will
- ;; be wrong.
- (setq mode (if (eq buffer standard-output)
- "Buffer Menu"
- mode-name))
- (while (and (> excess 0) (= (aref size 0) ?\ ))
- (setq size (substring size 1))
- (setq excess (1- excess))))
+ (setq size (format "%8d" this-buffer-size))
+ ;; Ack -- if looking at the *Buffer List* buffer,
+ ;; always use "Buffer Menu" mode. Otherwise the
+ ;; first time the buffer is created, the mode will be wrong.
+ (setq mode this-buffer-mode-name)
+ (while (and (> excess 0) (= (aref size 0) ?\ ))
+ (setq size (substring size 1))
+ (setq excess (1- excess)))
(princ size)
(indent-to 27 1)
(princ mode))
(indent-to 40 1)
- (or file
- ;; No visited file. Check local value of
- ;; list-buffers-directory.
- (save-excursion
- (set-buffer buffer)
- (if (and (boundp 'list-buffers-directory)
- list-buffers-directory)
- (setq file list-buffers-directory))))
+ (or file (setq file this-buffer-directory))
(if file
(princ file))
(princ "\n"))))
- (setq bl (cdr bl)))))
- ;; DESIRED-POINT doesn't have to be set; it is not when the
- ;; current buffer is not displayed for some reason.
- (save-excursion
- (set-buffer blist-buffer)
+ (setq bl (cdr bl))))
(Buffer-menu-mode)
+ ;; DESIRED-POINT doesn't have to be set; it is not when the
+ ;; current buffer is not displayed for some reason.
(and desired-point
(goto-char desired-point))
- (setq ZZZ (point)))))
+ (current-buffer))))
;;; buff-menu.el ends here