summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-29 21:22:31 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-29 21:22:31 -0800
commitdf4a824341f34b1d2d890ce3e9dd7f6df6475953 (patch)
tree39260cf419b5f6f71cbfd39a4fa508a5ed0122cd /contrib/emacs
parentc6fef0bbea485ff8aec979177ee5c1c568fffc55 (diff)
parent84989bd820119260c4fcd0dd5ee8a50bc8ff0d2c (diff)
downloadgit-df4a824341f34b1d2d890ce3e9dd7f6df6475953.tar.gz
Merge branch 'maint'
* maint: Documentation cherry-pick: Fix cut-and-paste error git.el: find the git-status buffer whatever its name is git-gui: Paper bag fix info dialog when no files are staged at commit
Diffstat (limited to 'contrib/emacs')
-rw-r--r--contrib/emacs/git.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index cc21e9c682..c9268234a5 100644
--- 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))