# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1019572319 0
# Node ID f2802fbc2d651566160ebe340f7feb32487594e4
# Parent  d3cf508b0ac5a74b49b64340a346e656622aea3f
(menu-bar-update-buffers-1): Don't display a directory separator if
there's no directory.  Don't display directories at all if uniquify is
active.  Some code cleanup.
(uniquify-buffer-name-style): Declare (but don't initialize).

diff -r d3cf508b0ac5 -r f2802fbc2d65 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Tue Apr 23 10:34:23 2002 +0000
+++ b/lisp/menu-bar.el	Tue Apr 23 14:31:59 2002 +0000
@@ -68,6 +68,10 @@
 
 ;; This alias is for compatibility with 19.28 and before.
 (defvar menu-bar-file-menu menu-bar-files-menu)
+
+;; This is referenced by some code below; it is defined in uniquify.el
+(defvar uniquify-buffer-name-style)
+
 
 ;; The "File" menu items
 (define-key menu-bar-files-menu [exit-emacs]
@@ -1260,27 +1264,23 @@
   (select-frame frame)))
 
 (defun menu-bar-update-buffers-1 (elt)
-  (cons (format
- 	 ;; (format "%%%ds  %%s%%s  %%s" menu-bar-update-buffers-maxbuf)
-	 "%s  %s%s  --  %s"
-	 (cdr elt)
-	 (if (buffer-modified-p (car elt))
-	     "*" " ")
-	 (save-excursion
-	   (set-buffer (car elt))
-	   (if buffer-read-only "%" " "))
-	 (let ((file
-		(or (buffer-file-name (car elt))
-		    (save-excursion
-		      (set-buffer (car elt))
-		      list-buffers-directory)
-		    "")))
-	   (setq file (or (file-name-directory file)
-			  ""))
-	   (if (> (length file) 20)
-	       (setq file (concat "..." (substring file -17))))
-	   file))
-	(car elt)))
+  ;; (format "%%%ds  %%s%%s  %%s" menu-bar-update-buffers-maxbuf)
+  (let* ((buf (car elt))
+	 (file
+	  (and (null uniquify-buffer-name-style)
+	       (or (buffer-file-name buf)
+		   (buffer-local-value 'list-buffers-directory buf))))
+	 (mod (if (buffer-modified-p buf) "*" ""))
+	 (ro (if (buffer-local-value 'buffer-read-only buf) "%" "")))
+    (when file
+      (setq file (file-name-directory file)))
+    (when (and file (> (length file) 20))
+      (setq file (concat "..." (substring file -17))))
+    (cons (if file
+	      (format "%s  %s%s  --  %s" (cdr elt) mod ro file)
+	    (format "%s  %s%s" (cdr elt) mod ro))
+	  buf)))
+
 
 ;; Used to cache the menu entries for commands in the Buffers menu
 (defvar menu-bar-buffers-menu-command-entries nil)