# HG changeset patch
# User Kenichi Handa  <handa@m17n.org>
# Date 1262915609 -32400
# Node ID 19b3c3f93cd1b8aa86c8770e8243461a1e761341
# Parent  8e1704b5a4b353fe0bd142d4249c62d92ed25439# Parent  e778a4a0f82171d2ba78486f05c5217a935d0546
from trunk

diff -r 8e1704b5a4b3 -r 19b3c3f93cd1 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 08 10:46:22 2010 +0900
+++ b/lisp/ChangeLog	Fri Jan 08 10:53:29 2010 +0900
@@ -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 -r 8e1704b5a4b3 -r 19b3c3f93cd1 lisp/vc-dir.el
--- a/lisp/vc-dir.el	Fri Jan 08 10:46:22 2010 +0900
+++ b/lisp/vc-dir.el	Fri Jan 08 10:53:29 2010 +0900
@@ -101,7 +101,9 @@
                       (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 @@
     (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.