summaryrefslogtreecommitdiff
path: root/lisp/vc-dir.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-01-07 23:46:44 +0100
committerJuanma Barranquero <lekktu@gmail.com>2010-01-07 23:46:44 +0100
commit1dfae2a207d0825e57c0ada259de77f7e68a6399 (patch)
tree15b3d4dad24b25b4510aae4d561da3413dbfc50d /lisp/vc-dir.el
parent32d59dc3dbdc16c25f1f78659d3167c8f9670868 (diff)
Fix bug#3224.
* 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.
Diffstat (limited to 'lisp/vc-dir.el')
-rw-r--r--lisp/vc-dir.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 61cc857544..6563ac8355 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.