# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1204228019 0
# Node ID 15905daa91d3aeeec7e766fbdde0c80734980239
# Parent  58e18c83bf75b26bca6d0c11cf9eab7cb1b7978f
(uniquify-buffer-base-name): Undo last change.

diff -r 58e18c83bf75 -r 15905daa91d3 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 28 19:43:51 2008 +0000
+++ b/lisp/ChangeLog	Thu Feb 28 19:46:59 2008 +0000
@@ -1,3 +1,7 @@
+2008-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* uniquify.el (uniquify-buffer-base-name): Undo last change.
+
 2008-02-28  Daiki Ueno  <ueno@unixuser.org>
 
 	* international/utf-7.el (utf-7-encode): Never skip the trailing - for
diff -r 58e18c83bf75 -r 15905daa91d3 lisp/uniquify.el
--- a/lisp/uniquify.el	Thu Feb 28 19:43:51 2008 +0000
+++ b/lisp/uniquify.el	Thu Feb 28 19:46:59 2008 +0000
@@ -72,7 +72,7 @@
 ;; Add uniquify-list-buffers-directory-modes
 ;;   Stefan Monnier <monnier@cs.yale.edu> 17 Nov 2000
 ;; Algorithm and data structure changed to reduce consing with lots of buffers
-;;   Francesco Potortì <pot@gnu.org> (ideas by rms and monnier) 2001-07-18
+;;   Francesco Potortì <pot@gnu.org> (ideas by rms and monnier) 2001-07-18
 
 ;; Valuable feedback was provided by
 ;; Paul Smith <psmith@baynetworks.com>,
@@ -192,11 +192,9 @@
 ;; Used in desktop.el to save the non-uniquified buffer name
 (defun uniquify-buffer-base-name ()
   "Return the base name of the current buffer.
-Return nil if the buffer is not managed by uniquify,
-or if the base name is empty."
+Return nil if the buffer is not managed by uniquify."
   (and uniquify-managed
-       (let ((base (uniquify-item-base (car uniquify-managed))))
-	 (if (string= base "") nil base))))
+       (uniquify-item-base (car uniquify-managed))))
 
 ;;; Main entry point.