2 files changed, 8 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3c63fba027..dba3d58d9a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * uniquify.el (uniquify-buffer-base-name): Undo last change.  Should be
+        done in desktop.el instead.
+
 2008-02-28  Glenn Morris  <rgm@gnu.org>
 
         * autoinsert.el (auto-insert-alist): Update to FDL 1.2.
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index c316a47fbf8..fc03ec41c91 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -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>,
@@ -194,11 +194,9 @@ It actually holds the list of `uniquify-item's corresponding to the conflict.")
 ;; 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.