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

[Stefan Monnier]

Index: emacs/lisp/uniquify.el
diff -c emacs/lisp/uniquify.el:1.55 emacs/lisp/uniquify.el:1.56
*** emacs/lisp/uniquify.el:1.55 Wed Jan  5 21:20:38 2005
--- emacs/lisp/uniquify.el      Wed Jan  5 21:49:02 2005
***************
*** 194,201 ****
             (uniquify-item-base (car uniquify-managed)) (buffer-name))
         (uniquify-buffer-file-name (current-buffer))
         (current-buffer)))
!   (if (null dirname)
!       (with-current-buffer newbuf (setq uniquify-managed nil))
      (setq dirname (expand-file-name (directory-file-name dirname)))
      (let ((fix-list (list (uniquify-make-item base dirname newbuf)))
          items)
--- 194,203 ----
             (uniquify-item-base (car uniquify-managed)) (buffer-name))
         (uniquify-buffer-file-name (current-buffer))
         (current-buffer)))
!   ;; Make sure we don't get confused by outdated uniquify-managed info in
!   ;; this buffer.
!   (with-current-buffer newbuf (setq uniquify-managed nil))
!   (when dirname
      (setq dirname (expand-file-name (directory-file-name dirname)))
      (let ((fix-list (list (uniquify-make-item base dirname newbuf)))
          items)