*** empty log message ***

[gnu-emacs] / lisp / uniquify.el

diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 7a992d6becbd6d58fd5cb4251f9b17fc66e2b066..656f5c3708017876bc7d32019f9237157d056aaa 100644 (file)
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -111,7 +111,7 @@ would have the following buffer names in the various styles:
                (const :tag "standard Emacs behavior (nil)" nil))
   :require 'uniquify)
 
-(defcustom uniquify-after-kill-buffer-p nil
+(defcustom uniquify-after-kill-buffer-p t
   "If non-nil, rerationalize buffer names after a buffer has been killed."
   :type 'boolean)
 
@@ -122,7 +122,7 @@ other buffer names are changed."
   :type 'boolean)
 
 ;; The default value matches certain Gnus buffers.
-(defcustom uniquify-ignore-buffers-re "^\\*\\(un\\)?sent "
+(defcustom uniquify-ignore-buffers-re nil
   "*Regular expression matching buffer names that should not be uniquified.
 For instance, set this to \"^draft-[0-9]+$\" to avoid having uniquify rename
 draft buffers even if `uniquify-after-kill-buffer-p' is non-nil and the
@@ -213,11 +213,11 @@ this rationaliztion."
            (setf (uniquify-item-dirname (car items))
                  (uniquify-buffer-file-name
                   (uniquify-item-buffer (car items))))
-           ;; This shouldn't happen, but maybe there' no dirname any more.
+           ;; This shouldn't happen, but maybe there's no dirname any more.
            (unless (uniquify-item-dirname (car items))
-             (setq items nil)
              (with-current-buffer (uniquify-item-buffer (car items))
-               (setq uniquify-managed nil))))
+               (setq uniquify-managed nil))
+             (setq items nil)))
          (setq fix-list (append fix-list items))))
       ;; selects buffers whose names may need changing, and others that
       ;; may conflict, then bring conflicting names together