# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1262908192 0
# Node ID 14f1e1d973968f854f74126e22ad7503575c7212
# Parent  41ffd6d293f4c9a49d029d06763c4894936ef713# Parent  e778a4a0f82171d2ba78486f05c5217a935d0546
Merge from mainline.

diff -r 41ffd6d293f4 -r 14f1e1d97396 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 06 23:07:49 2010 +0000
+++ b/lisp/ChangeLog	Thu Jan 07 23:49:52 2010 +0000
@@ -1,3 +1,10 @@
+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 41ffd6d293f4 -r 14f1e1d97396 lisp/vc-dir.el
--- a/lisp/vc-dir.el	Wed Jan 06 23:07:49 2010 +0000
+++ b/lisp/vc-dir.el	Thu Jan 07 23:49:52 2010 +0000
@@ -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.