From 42b4ee207b146590df193db03be6487a26098797 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 28 Feb 2008 19:46:59 +0000 Subject: [PATCH] (uniquify-buffer-base-name): Undo last change. --- lisp/ChangeLog | 4 ++++ lisp/uniquify.el | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bbeb08782ba..f39d6a0d807 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-02-28 Stefan Monnier + + * uniquify.el (uniquify-buffer-base-name): Undo last change. + 2008-02-28 Daiki Ueno * international/utf-7.el (utf-7-encode): Never skip the trailing - for diff --git a/lisp/uniquify.el b/lisp/uniquify.el index 4d4f755aa6a..07772bd6cda 100644 --- a/lisp/uniquify.el +++ b/lisp/uniquify.el @@ -72,7 +72,7 @@ ;; Add uniquify-list-buffers-directory-modes ;; Stefan Monnier 17 Nov 2000 ;; Algorithm and data structure changed to reduce consing with lots of buffers -;; Francesco Potortì (ideas by rms and monnier) 2001-07-18 +;; Francesco Potortì (ideas by rms and monnier) 2001-07-18 ;; Valuable feedback was provided by ;; Paul Smith , @@ -192,11 +192,9 @@ 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, -or if the base name is empty." +Return nil if the buffer is not managed by uniquify." (and uniquify-managed - (let ((base (uniquify-item-base (car uniquify-managed)))) - (if (string= base "") nil base)))) + (uniquify-item-base (car uniquify-managed)))) ;;; Main entry point. -- 2.39.2