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

3 files changed, 3 insertions, 3 deletions

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 877ab66ef..f0beb412e 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -45,7 +45,7 @@ OPTIONS
 	default is not to do `-x` so this option is a no-op.
 
 -m parent-number|--mainline parent-number::
-	Usually you cannot revert a merge because you do not know which
+	Usually you cannot cherry-pick a merge because you do not know which
 	side of the merge should be considered the mainline.  This
 	option specifies the parent number (starting from 1) of
 	the mainline and allows cherry-pick to replay the change
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index cc21e9c68..c9268234a 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))
diff --git a/git-gui/lib/error.tcl b/git-gui/lib/error.tcl
index 08a24622c..8c27678e3 100644
--- a/git-gui/lib/error.tcl
+++ b/git-gui/lib/error.tcl
@@ -47,7 +47,7 @@ proc info_popup {msg} {
 		append title " ([reponame])"
 	}
 	tk_messageBox \
-		-parent $parent \
+		-parent [_error_parent] \
 		-icon info \
 		-type ok \
 		-title $title \