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

[Stefan Monnier]

Index: emacs/lisp/uniquify.el
diff -c emacs/lisp/uniquify.el:1.54 emacs/lisp/uniquify.el:1.55
*** emacs/lisp/uniquify.el:1.54 Mon Dec 27 16:38:06 2004
--- emacs/lisp/uniquify.el      Wed Jan  5 21:20:38 2005
***************
*** 1,6 ****
  ;;; uniquify.el --- unique buffer names dependent on file name
  
! ;; Copyright (c) 1989,95,96,97,2001,2003  Free Software Foundation, Inc.
  
  ;; Author: Dick King <address@hidden>
  ;; Maintainer: FSF
--- 1,7 ----
  ;;; uniquify.el --- unique buffer names dependent on file name
  
! ;; Copyright (c) 1989, 1995, 1996, 1997, 2001, 2003, 2005
! ;;           Free Software Foundation, Inc.
  
  ;; Author: Dick King <address@hidden>
  ;; Maintainer: FSF
***************
*** 187,193 ****
  If `uniquify-min-dir-content' > 0, always pulls that many
  file name elements.
  Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes
! this rationaliztion."
    (if (null dirname)
        (with-current-buffer newbuf (setq uniquify-managed nil))
      (setq dirname (expand-file-name (directory-file-name dirname)))
--- 188,199 ----
  If `uniquify-min-dir-content' > 0, always pulls that many
  file name elements.
  Arguments BASE, DIRNAME, and NEWBUF specify the new buffer that causes
! this rationalization."
!   (interactive
!    (list (if uniquify-managed
!            (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)))
***************
*** 457,461 ****
  
  (provide 'uniquify)
  
! ;;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065
  ;;; uniquify.el ends here
--- 463,467 ----
  
  (provide 'uniquify)
  
! ;; arch-tag: e763faa3-56c9-4903-8eb8-26e1c45a0065
  ;;; uniquify.el ends here