[Emacs-diffs] Changes to emacs/lisp/buff-menu.el

[Eli Zaretskii]

Index: emacs/lisp/buff-menu.el
diff -u emacs/lisp/buff-menu.el:1.101 emacs/lisp/buff-menu.el:1.102
--- emacs/lisp/buff-menu.el:1.101       Mon Feb 20 00:56:31 2006
+++ emacs/lisp/buff-menu.el     Fri May 26 19:11:45 2006
@@ -116,6 +116,8 @@
 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
@@ -767,10 +769,24 @@
                           ?\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
+                         ((eq file t)
+                          (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.