diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-02-27 16:38:37 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-02-27 16:38:37 +0000 |
| commit | 0eb2977e77582b4ea0a794102a97ad4e14a55992 (patch) | |
| tree | bd1fb719a74da43e8b8763ea3d598a7abd34da48 | |
| parent | 4fbbba1d35117dd65ea614dbb2799bd2f26ee5ed (diff) | |
| download | emacs-0eb2977e77582b4ea0a794102a97ad4e14a55992.tar.gz | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/uniquify.el | 3 |
2 files changed, 3 insertions, 2 deletions
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)))) |