From: Miles Bader <miles@gnu.org>
Date: Wed, 24 Apr 2002 00:08:34 +0000 (+0000)
Subject: (menu-bar-update-buffers-1): Make sure `uniquify-buffer-name-style' is bound.
X-Git-Tag: ttn-vms-21-2-B4~15444
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7c1fc733989b4b707c7c84bb6d4645548f07ef59;p=emacs.git

(menu-bar-update-buffers-1): Make sure `uniquify-buffer-name-style' is bound.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ad90a64721..a051c4ad7bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-24  Miles Bader  <miles@gnu.org>
+
+	* menu-bar.el (menu-bar-update-buffers-1): Make sure
+	`uniquify-buffer-name-style' is bound.
+
 2002-04-23  Colin Walters  <walters@verbum.org>
 
 	* replace.el (toplevel): Require `cl' while compiling.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 959c68cc6ac..3618c8a5122 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1267,7 +1267,8 @@ key (or menu-item)"))
   ;; (format "%%%ds  %%s%%s  %%s" menu-bar-update-buffers-maxbuf)
   (let* ((buf (car elt))
 	 (file
-	  (and (null uniquify-buffer-name-style)
+	  (and (or (not (boundp 'uniquify-buffer-name-style))
+		   (null uniquify-buffer-name-style))
 	       (or (buffer-file-name buf)
 		   (buffer-local-value 'list-buffers-directory buf))))
 	 (mod (if (buffer-modified-p buf) "*" ""))