# HG changeset patch # User Francesco Potort # Date 996692853 0 # Node ID 683a60ba253338246209e844afe3d991d8f595d0 # Parent 9b93e839efdaa69e71e52c8a31362a66c7f8ab97 These changes correct a corner case that the old code managed correctly. Precisely when you have a buffer visiting a file in the root directory and then revert it to a file with the same name in a different directory. (uniquify-fix-item-proposed): Renamed from uniquify-fix-item-min-proposed. (uniquify-set-proposed): New function. (uniquify-rationalize-file-buffer-names): Code reshuffled for clarity and speed. (uniquify-item-greaterp): Substitutes uniquify-item-lessp. This is equivalent to what the old code did. (uniquify-rationalize-a-list): Never recompute the proposed name. Sort the conflicting sublist before rationalising it: this is equivalent to what the old code did, but one directory element at a time, and only when necessary. (uniquify-rationalize-conflicting-sublist): Recompute here the proposed name. diff -r 9b93e839efda -r 683a60ba2533 lisp/uniquify.el --- a/lisp/uniquify.el Wed Aug 01 19:05:32 2001 +0000 +++ b/lisp/uniquify.el Wed Aug 01 19:07:33 2001 +0000 @@ -74,7 +74,7 @@ ;; Andre Srinivasan 9 Sep 97 ;; Add uniquify-list-buffers-directory-modes ;; Stefan Monnier 17 Nov 2000 -;; Cleanup of uniquify-*-lessp reduced consing when using lots of buffers +;; Algorithm change reduced consing when using lots of buffers ;; Francesco Potort (ideas by rms and monnier) 2001-07-18 ;; Valuable feedback was provided by @@ -176,7 +176,8 @@ (defalias 'uniquify-fix-item-base 'car) (defalias 'uniquify-fix-item-filename 'cadr) (defsubst uniquify-fix-item-buffer (x) (car (cdr (cdr x)))) -(defsubst uniquify-fix-item-min-proposed (x) (nth 3 x)) +(defsubst uniquify-fix-item-proposed (x) (nth 3 x)) +(defsubst uniquify-set-proposed (x p) (setcar (nthcdr 3 x) p)) ;; Internal variables used free (defvar uniquify-non-file-buffer-names nil) @@ -195,9 +196,8 @@ (uniquify-file-name-nondirectory newbuffile)))) (dolist (buffer (buffer-list)) (let ((bufname (buffer-name buffer)) - bfn rawname min-proposed) - (if (and (not (string= " **lose**" bufname)) - (not (and uniquify-ignore-buffers-re + bfn rawname proposed) + (if (and (not (and uniquify-ignore-buffers-re (string-match uniquify-ignore-buffers-re bufname))) (setq bfn (if (eq buffer newbuf) @@ -210,14 +210,12 @@ (setq rawname (uniquify-file-name-nondirectory bfn)) (or (not newbuffile) (equal rawname newbuffile-nd)) - (setq min-proposed (uniquify-get-proposed-name - rawname bfn uniquify-min-dir-content))) - (push (list rawname bfn buffer min-proposed) fix-list) + (setq proposed (uniquify-get-proposed-name + rawname bfn uniquify-min-dir-content))) + (push (list rawname bfn buffer proposed) fix-list) (push (list bufname) uniquify-non-file-buffer-names)))) ;; selects buffers whose names may need changing, and others that - ;; may conflict. - (setq fix-list (sort fix-list 'uniquify-item-lessp)) - ;; bringing conflicting names together + ;; may conflict, then bring conflicting names together (uniquify-rationalize-a-list fix-list uniquify-min-dir-content))) ;; uniquify's version of buffer-file-name; result never contains trailing slash @@ -240,21 +238,16 @@ (car dired-directory) dired-directory))))))))) -(defun uniquify-item-lessp (item1 item2) - (string-lessp (uniquify-fix-item-min-proposed item1) - (uniquify-fix-item-min-proposed item2))) +(defun uniquify-item-greaterp (item1 item2) + (string-lessp (uniquify-fix-item-proposed item2) + (uniquify-fix-item-proposed item1))) (defun uniquify-rationalize-a-list (fix-list depth) (let (conflicting-sublist ; all elements have the same proposed name (old-name "") proposed-name) - (dolist (item fix-list) - (setq proposed-name - (if (= depth uniquify-min-dir-content) - (uniquify-fix-item-min-proposed item) - (uniquify-get-proposed-name (uniquify-fix-item-base item) - (uniquify-fix-item-filename item) - depth))) + (dolist (item (sort fix-list 'uniquify-item-greaterp)) + (setq proposed-name (uniquify-fix-item-proposed item)) (unless (equal proposed-name old-name) (uniquify-rationalize-conflicting-sublist conflicting-sublist old-name depth) @@ -322,16 +315,23 @@ ;; Deal with conflicting-sublist, all of whose elements have identical ;; "base" components. -(defun uniquify-rationalize-conflicting-sublist (conflicting-sublist old-name depth) - (or (null conflicting-sublist) - (and (null (cdr conflicting-sublist)) - (not (assoc old-name uniquify-non-file-buffer-names)) - (or (and (not (string= old-name "")) - (uniquify-rename-buffer (car conflicting-sublist) old-name)) - t)) - (when uniquify-possibly-resolvable - (setq uniquify-possibly-resolvable nil) - (uniquify-rationalize-a-list conflicting-sublist (1+ depth))))) +(defun uniquify-rationalize-conflicting-sublist (conf-list old-name depth) + (when conf-list + (if (or (cdr conf-list) + (assoc old-name uniquify-non-file-buffer-names)) + (when uniquify-possibly-resolvable + (setq uniquify-possibly-resolvable nil + depth (1+ depth)) + (dolist (item conf-list) + (uniquify-set-proposed + item (uniquify-get-proposed-name + (uniquify-fix-item-base item) + (uniquify-fix-item-filename item) + depth))) + (uniquify-rationalize-a-list conf-list depth)) + (unless (string= old-name "") + (uniquify-rename-buffer (car conf-list) old-name))))) + (defun uniquify-rename-buffer (item newname) (let ((buffer (uniquify-fix-item-buffer item)))