From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 27 Feb 2008 16:38:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.1.92~54
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0eb2977e77582b4ea0a794102a97ad4e14a55992;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bc2fe80fbc..341702e7c8a 100644
--- 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 c07dd57af4e..4d4f755aa6a 100644
--- 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))))