;;; 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, 2005 Free Software Foundation, Inc.
+;; 2004, 2005, 2006 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: convenience
:type 'boolean
:group 'Buffer-menu)
-(defface Buffer-menu-buffer
+(defface buffer-menu-buffer
'((t (:weight bold)))
- "Face used to highlight buffer name."
- :group 'Buffer-menu
- :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)
file buffers. It affects both manual reverting and reverting by
Auto Revert Mode.")
+(defvar Info-current-file) ;; from info.el
+
(make-variable-buffer-local 'Buffer-menu-files-only)
(if Buffer-menu-mode-map
(prop (point-min))
;; do not make undo records for the reversion.
(buffer-undo-list t))
- (list-buffers-noselect Buffer-menu-files-only)
+ ;; 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)
(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
- (if Buffer-menu-use-header-line
- (concat "mouse-2: sort by " (downcase name))
- (concat "mouse-2, RET: sort by "
- (downcase name)))
- (if Buffer-menu-use-header-line
- "mouse-2: sort by visited order"
- "mouse-2, RET: 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)))
- (if Buffer-menu-use-header-line
- (define-key map [header-line mouse-2]
- `(lambda (e)
- (interactive "e")
- (save-window-excursion
- (if e (mouse-select-window e))
- (Buffer-menu-sort ,column))))
- (define-key map [mouse-2]
- `(lambda (e)
- (interactive "e")
- (if e (mouse-select-window e))
- (Buffer-menu-sort ,column)))
- (define-key map "\C-m"
- `(lambda () (interactive)
- (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.
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
(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))
?\s)))
(unless file
;; No visited file. Check local value of
- ;; list-buffers-directory.
- (when (and (boundp 'list-buffers-directory)
- list-buffers-directory)
- (setq file list-buffers-directory)))
+ ;; list-buffers-directory and, for Info buffers,
+ ;; Info-current-file.
+ (cond ((and (boundp 'list-buffers-directory)
+ list-buffers-directory)
+ (setq file list-buffers-directory))
+ ((eq major-mode 'Info-mode)
+ (setq file Info-current-file)
+ (cond
+ ((equal file "dir")
+ (setq file "*Info Directory*"))
+ ((eq file 'apropos)
+ (setq file "*Info Apropos*"))
+ ((eq file 'history)
+ (setq file "*Info History*"))
+ ((eq file 'toc)
+ (setq file "*Info TOC*"))
+ ((not (stringp file)) ;; avoid errors
+ (setq file nil))))))
(push (list buffer bits name (buffer-size) mode file)
list))))))
;; Preserve the original buffer-list ordering, just in case.
(int-to-string (nth 3 buffer))
`(buffer-name ,(nth 2 buffer)
buffer ,(car buffer)
- font-lock-face Buffer-menu-buffer
+ font-lock-face buffer-menu-buffer
mouse-face highlight
help-echo "mouse-2: select this buffer"))
" "
HCoop / bpt / emacs.git / blobdiff