;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*-
;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;; 2004 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
:type 'boolean
:group 'Buffer-menu)
-(defface Buffer-menu-buffer-face
+(defface buffer-menu-buffer
'((t (:weight bold)))
- "Face used to highlight buffer name."
- :group 'font-lock-highlighting-faces)
+ "Face used to highlight buffer names in the buffer menu."
+ :group 'Buffer-menu)
+(put 'Buffer-menu-buffer 'face-alias 'buffer-menu-buffer)
(defcustom Buffer-menu-buffer+size-width 26
"*How wide to jointly make the buffer name and size columns."
:type 'number
:group 'Buffer-menu)
+(defcustom Buffer-menu-use-frame-buffer-list t
+ "If non-nil, the Buffer Menu uses the selected frame's buffer list.
+Buffers that were never selected in that frame are listed at the end.
+If the value is nil, the Buffer Menu uses the global buffer list.
+This variable matters if the Buffer Menu is sorted by visited order,
+as it is by default."
+ :type 'boolean
+ :group 'Buffer-menu
+ :version "22.1")
+
;; This should get updated & resorted when you click on a column heading
(defvar Buffer-menu-sort-column nil
- "*2 for sorting by buffer names. 5 for sorting by file names.
+ "2 for sorting by buffer names. 5 for sorting by file names.
nil for default sorting by visited order.")
(defconst Buffer-menu-buffer-column 4)
(define-key Buffer-menu-mode-map "V" 'Buffer-menu-view)
(define-key Buffer-menu-mode-map "T" 'Buffer-menu-toggle-files-only)
(define-key Buffer-menu-mode-map [mouse-2] 'Buffer-menu-mouse-select)
+ (define-key Buffer-menu-mode-map [follow-link] 'mouse-face)
)
;; Buffer Menu mode is suitable only for specially formatted data.
#'(lambda (&optional noconfirm) 'fast))
(setq truncate-lines t)
(setq buffer-read-only t)
- (run-hooks 'buffer-menu-mode-hook))
+ (run-mode-hooks 'buffer-menu-mode-hook))
;; This function exists so we can make the doc string of Buffer-menu-mode
;; look nice.
(or (eq buffer-undo-list t)
(setq buffer-undo-list nil))
;; We can not use save-excursion here. The buffer gets erased.
- (let ((ocol (current-column))
+ (let ((opoint (point))
+ (eobp (eobp))
+ (ocol (current-column))
(oline (progn (move-to-column 4)
(get-text-property (point) 'buffer)))
(prop (point-min))
;; do not make undo records for the reversion.
(buffer-undo-list t))
- (list-buffers-noselect Buffer-menu-files-only)
- (while (setq prop (next-single-property-change prop 'buffer))
- (when (eq (get-text-property prop 'buffer) oline)
- (goto-char prop)
- (move-to-column ocol)))))
+ ;; We can be called by Auto Revert Mode with the "*Buffer Menu*"
+ ;; temporarily the current buffer. Make sure that the
+ ;; interactively current buffer is correctly identified with a `.'
+ ;; by `list-buffers-noselect'.
+ (with-current-buffer (window-buffer)
+ (list-buffers-noselect Buffer-menu-files-only))
+ (if oline
+ (while (setq prop (next-single-property-change prop 'buffer))
+ (when (eq (get-text-property prop 'buffer) oline)
+ (goto-char prop)
+ (move-to-column ocol)))
+ (goto-char (if eobp (point-max) opoint)))))
(defun Buffer-menu-toggle-files-only (arg)
"Toggle whether the current buffer-menu displays only file buffers.
(defun Buffer-menu-unmark (&optional backup)
"Cancel all requested operations on buffer on this line and move down.
-Optional ARG means move up."
+Optional prefix arg means move up."
(interactive "P")
(when (Buffer-menu-no-header)
(let* ((buf (Buffer-menu-buffer t))
(save-excursion
(beginning-of-line)
(forward-char 2)
- (if (= (char-after) (if arg ? ?*))
+ (if (= (char-after) (if arg ?\s ?*))
(let ((buffer-read-only nil))
(delete-char 1)
- (insert (if arg ?* ? ))))))
+ (insert (if arg ?* ?\s))))))
(defun Buffer-menu-beginning ()
(goto-char (point-min))
(setq modp (buffer-modified-p)))
(let ((buffer-read-only nil))
(delete-char -1)
- (insert (if modp ?* ? ))))))
+ (insert (if modp ?* ?\s))))))
(save-excursion
(Buffer-menu-beginning)
(let ((buff-menu-buffer (current-buffer))
(save-excursion (kill-buffer buf)))
(if (and buf (buffer-name buf))
(progn (delete-char 1)
- (insert ? ))
+ (insert ?\s))
(delete-region (point) (progn (forward-line 1) (point)))
(unless (bobp)
(forward-char -1))))))))
(setq tem (Buffer-menu-buffer t))
(let ((buffer-read-only nil))
(delete-char -1)
- (insert ?\ ))
+ (insert ?\s))
(or (eq tem buff) (memq tem others) (setq others (cons tem others))))
(setq others (nreverse others)
tem (/ (1- (frame-height)) (1+ (length others))))
(save-excursion
(set-buffer (Buffer-menu-buffer t))
(vc-toggle-read-only)
- (setq char (if buffer-read-only ?% ? )))
+ (setq char (if buffer-read-only ?% ?\s)))
(save-excursion
(beginning-of-line)
(forward-char 1)
(make-string (- Buffer-menu-buffer+size-width
(length name)
(length size))
- ? )
+ ?\s)
size))
(defun Buffer-menu-sort (column)
(insert m2)))
(forward-line)))))
+(defun Buffer-menu-sort-by-column (&optional e)
+ "Sort the buffer menu by the column clicked on."
+ (interactive (list last-input-event))
+ (if e (mouse-select-window e))
+ (let* ((pos (event-start e))
+ (obj (posn-object pos))
+ (col (if obj
+ (get-text-property (cdr obj) 'column (car obj))
+ (get-text-property (posn-point pos) 'column))))
+ (Buffer-menu-sort col)))
+
+(defvar Buffer-menu-sort-button-map
+ (let ((map (make-sparse-keymap)))
+ ;; This keymap handles both nil and non-nil values for
+ ;; Buffer-menu-use-header-line.
+ (define-key map [header-line mouse-1] 'Buffer-menu-sort-by-column)
+ (define-key map [header-line mouse-2] 'Buffer-menu-sort-by-column)
+ (define-key map [mouse-2] 'Buffer-menu-sort-by-column)
+ (define-key map [follow-link] 'mouse-face)
+ (define-key map "\C-m" 'Buffer-menu-sort-by-column)
+ map)
+ "Local keymap for Buffer menu sort buttons.")
+
(defun Buffer-menu-make-sort-button (name column)
(if (equal column Buffer-menu-sort-column) (setq column nil))
(propertize name
- 'help-echo (if column
- (concat "mouse-2: sort by " (downcase name))
- "mouse-2: sort by visited order")
+ 'column column
+ 'help-echo (concat
+ (if Buffer-menu-use-header-line
+ "mouse-1, mouse-2: sort by "
+ "mouse-2, RET: sort by ")
+ (if column (downcase name) "visited order"))
'mouse-face 'highlight
- 'keymap (let ((map (make-sparse-keymap)))
- (define-key map [header-line mouse-2]
- `(lambda (e)
- (interactive "e")
- (save-window-excursion
- (if e (mouse-select-window e))
- (Buffer-menu-sort ,column))))
- map)))
+ 'keymap Buffer-menu-sort-button-map))
(defun list-buffers-noselect (&optional files-only buffer-list)
"Create and return a buffer with a list of names of existing buffers.
For more information, see the function `buffer-menu'."
(let* ((old-buffer (current-buffer))
(standard-output standard-output)
- (mode-end (make-string (- Buffer-menu-mode-width 2) ? ))
+ (mode-end (make-string (- Buffer-menu-mode-width 2) ?\s))
(header (concat "CRM "
(Buffer-menu-buffer+size
(Buffer-menu-make-sort-button "Buffer" 2)
list desired-point)
(when Buffer-menu-use-header-line
(let ((pos 0))
- ;; Turn spaces in the header into stretch specs so they work
- ;; regardless of the header-line face.
- (while (string-match "[ \t]+" header pos)
+ ;; Turn whitespace chars in the header into stretch specs so
+ ;; they work regardless of the header-line face.
+ (while (string-match "[ \t\n]+" header pos)
(setq pos (match-end 0))
(put-text-property (match-beginning 0) pos 'display
;; Assume fixed-size chars in the buffer.
(erase-buffer)
(setq standard-output (current-buffer))
(unless Buffer-menu-use-header-line
+ ;; Use U+2014 (EM DASH) to underline if possible, else U+002D (HYPHEN-MINUS)
(let ((underline (if (char-displayable-p ?—) ?— ?-)))
(insert header
(apply 'string
(mapcar (lambda (c)
- (if (memq c '(?\n ?\ )) c underline))
+ (if (memq c '(?\n ?\s)) c underline))
header)))))
;; Collect info for every buffer we're interested in.
- (dolist (buffer (or buffer-list (buffer-list)))
+ (dolist (buffer (or buffer-list
+ (buffer-list
+ (when Buffer-menu-use-frame-buffer-list
+ (selected-frame)))))
(with-current-buffer buffer
(let ((name (buffer-name))
(file buffer-file-name))
(format-mode-line mode-line-process
nil nil buffer))))
(bits (string
- (if (eq buffer old-buffer) ?. ?\ )
+ (if (eq buffer old-buffer) ?. ?\s)
;; Handle readonly status. The output buffer
;; is special cased to appear readonly; it is
;; actually made so at a later date.
(if (or (eq buffer standard-output)
buffer-read-only)
- ?% ?\ )
+ ?% ?\s)
;; Identify modified buffers.
- (if (buffer-modified-p) ?* ?\ )
+ (if (buffer-modified-p) ?* ?\s)
;; Space separator.
- ?\ )))
+ ?\s)))
(unless file
;; No visited file. Check local value of
;; list-buffers-directory.
(int-to-string (nth 3 buffer))
`(buffer-name ,(nth 2 buffer)
buffer ,(car buffer)
- face Buffer-menu-buffer-face
+ font-lock-face buffer-menu-buffer
mouse-face highlight
help-echo "mouse-2: select this buffer"))
" "