Mercurial > emacs

diff lisp/buff-menu.el @ 89954:97905c4f1a42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-24 Merge from lorentey@elte.hu--2004/emacs--hacks--0, emacs--cvs-trunk--0 Patches applied: * lorentey@elte.hu--2004/emacs--hacks--0--patch-2 Prevent special events from appending dashes to the echo string. * lorentey@elte.hu--2004/emacs--hacks--0--patch-4 Added ChangeLog entry. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-451 Update from CVS: lisp/subr.el (get-buffer-window-list): Doc fix. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-452 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-454 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-455 Bash the dashes * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-456 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-458 Update from CVS
author Miles Bader <miles@gnu.org>
date Sat, 17 Jul 2004 02:46:48 +0000
parents 68c22ea6027c bc9ffd7cc15c
children cce1c0ee76ee
line wrap: on
line diff
--- a/lisp/buff-menu.el	Sun Jul 11 22:08:06 2004 +0000
+++ b/lisp/buff-menu.el	Sat Jul 17 02:46:48 2004 +0000
@@ -613,7 +613,7 @@
 			 "  "
 			 (Buffer-menu-make-sort-button "Mode" 4) mode-end
 			 (Buffer-menu-make-sort-button "File" 5) "\n"))
-	 list desired-point name file)
+	 list desired-point name mode file)
     (when Buffer-menu-use-header-line
       (let ((pos 0))
 	;; Turn spaces in the header into stretch specs so they work
@@ -638,8 +638,14 @@
 		  (mapcar
 		   (lambda (buffer)
 		     (with-current-buffer buffer
-		       (setq name (buffer-name)
-			     file (buffer-file-name))
+		       (save-window-excursion
+			 (setq name (buffer-name)
+			       mode (progn
+				      (set-window-buffer (selected-window) buffer)
+				      (concat (format-mode-line mode-name)
+					      (if mode-line-process
+						  (format-mode-line mode-line-process))))
+			       file (buffer-file-name)))
 		       (cond
 			;; Don't mention internal buffers.
 			((and (string= (substring name 0 1) " ") (null file)))
@@ -665,7 +671,7 @@
 					   ?% ? )
 				       ;; Identify modified buffers.
 				       (if (buffer-modified-p) ?* ? ))
-			       name (buffer-size) mode-name file)))))
+			       name (buffer-size) mode file)))))
 		   (buffer-list))))
       (dolist (buffer
 	       (if Buffer-menu-sort-column