[Emacs-diffs] Changes to emacs/lisp/uniquify.el

[Stefan Monnier]

Index: emacs/lisp/uniquify.el
diff -c emacs/lisp/uniquify.el:1.51 emacs/lisp/uniquify.el:1.52
*** emacs/lisp/uniquify.el:1.51 Sat May 10 18:45:06 2003
--- emacs/lisp/uniquify.el      Tue May 13 15:15:19 2003
***************
*** 111,117 ****
                (const :tag "standard Emacs behavior (nil)" nil))
    :require 'uniquify)
  
! (defcustom uniquify-after-kill-buffer-p nil
    "If non-nil, rerationalize buffer names after a buffer has been killed."
    :type 'boolean)
  
--- 111,117 ----
                (const :tag "standard Emacs behavior (nil)" nil))
    :require 'uniquify)
  
! (defcustom uniquify-after-kill-buffer-p t
    "If non-nil, rerationalize buffer names after a buffer has been killed."
    :type 'boolean)
  
***************
*** 122,128 ****
    :type 'boolean)
  
  ;; The default value matches certain Gnus buffers.
! (defcustom uniquify-ignore-buffers-re "^\\*\\(un\\)?sent "
    "*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
--- 122,128 ----
    :type 'boolean)
  
  ;; The default value matches certain Gnus buffers.
! (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,219 ****
            (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.
            (unless (uniquify-item-dirname (car items))
              (with-current-buffer (uniquify-item-buffer (car items))
                (setq uniquify-managed nil))
--- 213,219 ----
            (setf (uniquify-item-dirname (car items))
                  (uniquify-buffer-file-name
                   (uniquify-item-buffer (car items))))
!           ;; This shouldn't happen, but maybe there's no dirname any more.
            (unless (uniquify-item-dirname (car items))
              (with-current-buffer (uniquify-item-buffer (car items))
                (setq uniquify-managed nil))