bug#3224: 23.0.92; vc-dir vs uniquify: wrong directory used

[Stefan Monnier]

> --- lisp/uniquify.el  2010-01-04 05:35:18 +0000
> +++ lisp/uniquify.el  2010-01-06 03:22:51 +0000
> @@ -232,9 +232,9 @@
>           ;; of code like in set-visited-file-name:
>           ;; (or (string= new-name (buffer-name)) (rename-buffer new-name t))
>           ;; So we need to refresh the dirname of the uniquify-item.
> -         (setf (uniquify-item-dirname (car items))
> -               (uniquify-buffer-file-name
> -                (uniquify-item-buffer (car items))))
> +         (let ((bfn (uniquify-buffer-file-name (uniquify-item-buffer (car
> items)))))
> +           (when bfn
> +             (setf (uniquify-item-dirname (car items)) bfn)))

That doesn't sound right.
Why is bfn nil in your case, and why should we not update
uniquify-item-dirname correspondingly?

> @@ -265,9 +265,11 @@
>                  list-buffers-directory))))
>        (when filename
>       (directory-file-name
> -      (file-name-directory
> -       (expand-file-name
> -        (directory-file-name filename))))))))
> +      (if (file-directory-p filename)
> +          (file-name-as-directory filename)
> +        (file-name-directory
> +         (expand-file-name
> +          (directory-file-name filename)))))))))

I don't thing that's right.  Instead, you probably want to set
list-buffers-directory to something like (expand-file-name "*vc-dir*"),
as is done in PCL-CVS.


        Stefan