Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 382-398)

   - Update from CVS
   - Update from erc--emacs--22
   - Fix ERC bug introduced in last patch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 123-125)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index e9e7e9a2bb8..398b362d4e4 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -117,6 +117,7 @@ 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)
 
@@ -786,7 +787,12 @@ For more information, see the function `buffer-menu'."
                           ((eq file 'toc)
                            (setq file "*Info TOC*"))
                           ((not (stringp file))  ;; avoid errors
-                           (setq file nil))))))
+                           (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.