diff options
| -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 @@ | |||
| 2 | 2 | ||
| 3 | * uniquify.el (uniquify-buffer-base-name): If the base name is an | 3 | * uniquify.el (uniquify-buffer-base-name): If the base name is an |
| 4 | empty string, return nil to allow the caller to default to the | 4 | empty string, return nil to allow the caller to default to the |
| 5 | buffer name. | 5 | buffer name. Reported by Martin Fischer <parozusa@web.de>. |
| 6 | 6 | ||
| 7 | 2008-02-26 Jason Rumney <jasonr@gnu.org> | 7 | 2008-02-26 Jason Rumney <jasonr@gnu.org> |
| 8 | 8 | ||
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.") | |||
| 192 | ;; Used in desktop.el to save the non-uniquified buffer name | 192 | ;; Used in desktop.el to save the non-uniquified buffer name |
| 193 | (defun uniquify-buffer-base-name () | 193 | (defun uniquify-buffer-base-name () |
| 194 | "Return the base name of the current buffer. | 194 | "Return the base name of the current buffer. |
| 195 | Return nil if the buffer is not managed by uniquify." | 195 | Return nil if the buffer is not managed by uniquify, |
| 196 | or if the base name is empty." | ||
| 196 | (and uniquify-managed | 197 | (and uniquify-managed |
| 197 | (let ((base (uniquify-item-base (car uniquify-managed)))) | 198 | (let ((base (uniquify-item-base (car uniquify-managed)))) |
| 198 | (if (string= base "") nil base)))) | 199 | (if (string= base "") nil base)))) |