*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bc2fe80fbca437694a3bd3bcbbd50744acadc06..341702e7c8a30367baf0affb280d724b26028b5e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,7 +2,7 @@
 
        * 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.
+       buffer name.  Reported by Martin Fischer <parozusa@web.de>.
 
 2008-02-26  Jason Rumney  <jasonr@gnu.org>
 

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index c07dd57af4e99c2e70c47572d3a278d069e23252..4d4f755aa6a0b4fdceef3b21cf9fa5f55c4889ee 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -192,7 +192,8 @@ 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
        (let ((base (uniquify-item-base (car uniquify-managed))))
         (if (string= base "") nil base))))