From 4fbbba1d35117dd65ea614dbb2799bd2f26ee5ed Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 27 Feb 2008 16:24:08 +0000 Subject: [PATCH] (uniquify-buffer-base-name): If the base name is an empty string, return nil to allow the caller to default to the buffer name. --- lisp/ChangeLog | 8 +++++++- lisp/uniquify.el | 3 ++- 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 + + * 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 * 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 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. -- 2.39.2