summaryrefslogtreecommitdiff
path: root/lisp/uniquify.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2008-02-27 16:39:45 +0000
committerJuanma Barranquero <lekktu@gmail.com>2008-02-27 16:39:45 +0000
commit07e4bb9a3092874df2e8c49ab4f92219525aaac1 (patch)
tree93a421164e6f01598a264570c4946dfc47c10b41 /lisp/uniquify.el
parent70bb1e5f2a0905f3d121bd42e95f51744f544d2f (diff)
downloademacs-07e4bb9a3092874df2e8c49ab4f92219525aaac1.tar.gz
(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>.
Diffstat (limited to 'lisp/uniquify.el')
-rw-r--r--lisp/uniquify.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 802f18c3753..c316a47fbf8 100644
--- a/lisp/uniquify.el
+++ b/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.