*** empty log message ***

[bpt/emacs.git] / lisp / buff-menu.el

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index bb4bab7..398b362 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,10 +74,11 @@
   :type 'boolean
   :group 'Buffer-menu)
 
-(defface Buffer-menu-buffer
+(defface buffer-menu-buffer
   '((t (:weight bold)))
-  "Face used to highlight buffer name."
+  "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."
@@ -89,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)
@@ -105,6 +116,9 @@ This variable determines whether reverting the buffer lists only
 file buffers.  It affects both manual reverting and reverting by
 Auto Revert Mode.")
 
+(defvar Info-current-file) ;; from info.el
+(defvar Info-current-node) ;; from info.el
+
 (make-variable-buffer-local 'Buffer-menu-files-only)
 
 (if Buffer-menu-mode-map
@@ -695,9 +709,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.
@@ -715,6 +729,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
@@ -722,7 +737,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))
@@ -752,10 +770,29 @@ For more information, see the function `buffer-menu'."
                           ?\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))
+                         (t
+                          (setq file (concat "("
+                                             (file-name-nondirectory file)
+                                             ")"
+                                             Info-current-node)))))))
                (push (list buffer bits name (buffer-size) mode file)
                      list))))))
       ;; Preserve the original buffer-list ordering, just in case.
@@ -782,7 +819,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"))
                "  "