summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/uniquify.el3
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 531ca2e08bf..5bc2fe80fbc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,13 @@
+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.
+
2008-02-26 Jason Rumney <jasonr@gnu.org>
* files.el (make-auto-save-file-name): Encode more characters in
- non-file buffer names. Use url-encoding.
+ non-file buffer names. Use url-encoding.
2008-02-26 Juanma Barranquero <lekktu@gmail.com>
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index b2167f48656..c07dd57af4e 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -194,7 +194,8 @@ It actually holds the list of `uniquify-item's corresponding to the conflict.")
"Return the base name of the current buffer.
Return nil if the buffer is not managed by uniquify."
(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.