[Emacs-diffs] /srv/bzr/emacs/trunk r99273: Fix bug#3224.

[Juanma Barranquero]

------------------------------------------------------------
revno: 99273
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-07 23:46:44 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc-dir.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-06 19:38:39 +0000
+++ b/lisp/ChangeLog    2010-01-07 22:46:44 +0000
@@ -1,3 +1,10 @@
+2010-01-07  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * font-setting.el (font-setting-change-default-font): Use user-spec

=== modified file 'lisp/vc-dir.el'
--- a/lisp/vc-dir.el    2009-12-05 00:24:03 +0000
+++ b/lisp/vc-dir.el    2010-01-07 22:46:44 +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.