git.el: Set default directory before running the status mode setup hooks.

Also set the list-buffers-directory variable for nicer buffer list
display.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 5828d4c693e7f38b9b3e3e41994b5481babb9a97..2363e48c2998be39c72eebbb3e481d764b27ffd1 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -943,6 +943,7 @@ Commands:
     (erase-buffer)
   (let ((status (ewoc-create 'git-fileinfo-prettyprint "" "")))
     (set (make-local-variable 'git-status) status))
     (erase-buffer)
   (let ((status (ewoc-create 'git-fileinfo-prettyprint "" "")))
     (set (make-local-variable 'git-status) status))

+  (set (make-local-variable 'list-buffers-directory) default-directory)

   (run-hooks 'git-status-mode-hook)))
 
 (defun git-status (dir)
   (run-hooks 'git-status-mode-hook)))
 
 (defun git-status (dir)


@@ -952,8 +953,8 @@ Commands:
   (if (file-directory-p (concat (file-name-as-directory dir) ".git"))
       (let ((buffer (create-file-buffer (expand-file-name "*git-status*" dir))))
         (switch-to-buffer buffer)
   (if (file-directory-p (concat (file-name-as-directory dir) ".git"))
       (let ((buffer (create-file-buffer (expand-file-name "*git-status*" dir))))
         (switch-to-buffer buffer)

-        (git-status-mode)

         (cd dir)
         (cd dir)

+        (git-status-mode)

         (git-refresh-status)
         (goto-char (point-min)))
     (message "%s is not a git working tree." dir)))
         (git-refresh-status)
         (goto-char (point-min)))
     (message "%s is not a git working tree." dir)))