Merge branch 'maint'

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index cc21e9c682e4b4528de03f59e0ff8b8e6ef26b8d..c9268234a5b7342849a7a711e0bb0c6e4f003754 100644 (file)
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -1545,7 +1545,7 @@ Commands:
         (with-current-buffer buffer
           (when (and list-buffers-directory
                      (string-equal fulldir (expand-file-name list-buffers-directory))
-                     (string-match "\\*git-status\\*$" (buffer-name buffer)))
+                    (eq major-mode 'git-status-mode))
             (setq found buffer))))
       (setq list (cdr list)))
     found))