(uniquify-buffer-base-name): If the base name is an empty

string, return nil to allow the caller to default to the
buffer name.  Reported by Martin Fischer <parozusa@web.de>.

lisp/ChangeLog

 2008-02-27  Juanma Barranquero  <lekktu@gmail.com>
+	* uniquify.el (uniquify-buffer-base-name): If the base name is an
+	empty string, return nil to allow the caller to default to the
+	buffer name.  Reported by Martin Fischer <parozusa@web.de>.
+
 	* tool-bar.el (tool-bar-setup): Doc fix.
 	* mail/supercite.el (sc-describe):

lisp/uniquify.el

@@ -194,9 +194,11 @@ 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."
+Return nil if the buffer is not managed by uniquify,
+or if the base name is empty."
   (and uniquify-managed
-       (uniquify-item-base (car uniquify-managed))))
+       (let ((base (uniquify-item-base (car uniquify-managed))))
+	 (if (string= base "") nil base))))
 
 ;;; Main entry point.