from trunk

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ccafaf81928..95410b9393a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,13 @@
         * international/fontset.el (build-default-fontset-data): Exclude
         characters in scripts kana, hangul, han, or cjk-misc.
 
+2010-01-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * vc-dir.el (vc-dir-prepare-status-buffer): Pass a (fake) filename
+        to `create-file-buffer' as it expects, not just a buffer name.
+        (vc-dir-mode): Include the buffer name in `list-buffers-directory',
+        to help uniquify.  (Bug#3224)
+
 2010-01-06  Jan Djärv  <jan.h.d@swipnet.se>
 
         * font-setting.el (font-setting-change-default-font): Use user-spec
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 61cc8575449..6563ac83550 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -101,7 +101,9 @@ See `run-hooks'."
                       (return buffer))))))))
     (or buf
         ;; Create a new buffer named BNAME.
-        (with-current-buffer (create-file-buffer bname)
+        ;; We pass a filename to create-file-buffer because it is what
+        ;; the function expects, and also what uniquify needs (if active)
+        (with-current-buffer (create-file-buffer (expand-file-name bname dir))
           (cd dir)
           (vc-setup-buffer (current-buffer))
           ;; Reset the vc-parent-buffer-name so that it does not appear
@@ -928,7 +930,7 @@ the *vc-dir* buffer.
     (set (make-local-variable 'vc-ewoc) (ewoc-create #'vc-dir-printer))
     (set (make-local-variable 'revert-buffer-function)
          'vc-dir-revert-buffer-function)
-    (setq list-buffers-directory default-directory)
+    (setq list-buffers-directory (expand-file-name "*vc-dir*" default-directory))
     (add-to-list 'vc-dir-buffers (current-buffer))
     ;; Make sure that if the directory buffer is killed, the update
     ;; process running in the background is also killed.