(normal-splash-screen, fancy-splash-screens-1): Add a reference to the Lisp

[gnu-emacs] / lisp / buff-menu.el

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 4c45847df0f4d1953ed18b4996272569da29cae6..3094da3bfe83ba2f238c251f45d7568629ca2be7 100644 (file)
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -1,7 +1,7 @@
 ;;; 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
@@ -74,11 +74,11 @@
   :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."
@@ -90,9 +90,19 @@
   :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)
@@ -211,7 +221,12 @@ Letters do not insert themselves; instead, they are commands.
        (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)
@@ -691,9 +706,9 @@ For more information, see the function `buffer-menu'."
         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.
@@ -711,6 +726,7 @@ For more information, see the function `buffer-menu'."
       (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
@@ -718,7 +734,10 @@ For more information, see the function `buffer-menu'."
                                   (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))
@@ -778,7 +797,7 @@ For more information, see the function `buffer-menu'."
                                         (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"))
                "  "