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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ad90a64721ceb0899c8a0bbe0c555845a3f7115..a051c4ad7bd10392ef2d82cb6e80fb4b7c47d33b 100644 (file)
--- 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 959c68cc6ac8e3329860a2d9d679429d14a5fa6f..3618c8a51228bcbcf956168f257a999645d24107 100644 (file)
--- 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) "*" ""))