comparison lisp/buff-menu.el @ 90428:a8190f7e546e

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 285-296) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: admin/FOR-RELEASE: Update refcard section. * gnus--rel--5.10 (patch 102-104) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author Miles Bader <miles@gnu.org>
date Wed, 07 Jun 2006 18:05:10 +0000
parents d1c5430c5bff b4e6091c2346
children 138ce2701550
comparison
equal deleted inserted replaced
90427:ddb25860d044 90428:a8190f7e546e
113 (defvar Buffer-menu-files-only nil 113 (defvar Buffer-menu-files-only nil
114 "Non-nil if the current buffer-menu lists only file buffers. 114 "Non-nil if the current buffer-menu lists only file buffers.
115 This variable determines whether reverting the buffer lists only 115 This variable determines whether reverting the buffer lists only
116 file buffers. It affects both manual reverting and reverting by 116 file buffers. It affects both manual reverting and reverting by
117 Auto Revert Mode.") 117 Auto Revert Mode.")
118
119 (defvar Info-current-file) ;; from info.el
118 120
119 (make-variable-buffer-local 'Buffer-menu-files-only) 121 (make-variable-buffer-local 'Buffer-menu-files-only)
120 122
121 (if Buffer-menu-mode-map 123 (if Buffer-menu-mode-map
122 () 124 ()
765 (if (buffer-modified-p) ?* ?\s) 767 (if (buffer-modified-p) ?* ?\s)
766 ;; Space separator. 768 ;; Space separator.
767 ?\s))) 769 ?\s)))
768 (unless file 770 (unless file
769 ;; No visited file. Check local value of 771 ;; No visited file. Check local value of
770 ;; list-buffers-directory. 772 ;; list-buffers-directory and, for Info buffers,
771 (when (and (boundp 'list-buffers-directory) 773 ;; Info-current-file.
772 list-buffers-directory) 774 (cond ((and (boundp 'list-buffers-directory)
773 (setq file list-buffers-directory))) 775 list-buffers-directory)
776 (setq file list-buffers-directory))
777 ((eq major-mode 'Info-mode)
778 (setq file Info-current-file)
779 (cond
780 ((eq file t)
781 (setq file "*Info Directory*"))
782 ((eq file 'apropos)
783 (setq file "*Info Apropos*"))
784 ((eq file 'history)
785 (setq file "*Info History*"))
786 ((eq file 'toc)
787 (setq file "*Info TOC*"))
788 ((not (stringp file)) ;; avoid errors
789 (setq file nil))))))
774 (push (list buffer bits name (buffer-size) mode file) 790 (push (list buffer bits name (buffer-size) mode file)
775 list)))))) 791 list))))))
776 ;; Preserve the original buffer-list ordering, just in case. 792 ;; Preserve the original buffer-list ordering, just in case.
777 (setq list (nreverse list)) 793 (setq list (nreverse list))
778 ;; Place the buffers's info in the output buffer, sorted if necessary. 794 ;; Place the buffers's info in the output buffer, sorted if necessary.