Merge commit 'de238b39e335c6814283faa171b35145f124edf2'

1 files changed, 18 insertions, 16 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 318a9fb0253..9d1b7bf747d 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2643,22 +2643,24 @@ characters."
                   (setq def (lookup-key map key))
                   ;; Restore the match data while we process the command.
                   (cond ((eq def 'help)
-                         (with-output-to-temp-buffer "*Help*"
-                           (princ
-                            (concat "Query replacing "
-                                    (if backward "backward " "")
-                                    (if delimited-flag
-                                        (or (and (symbolp delimited-flag)
-                                                 (get delimited-flag
-                                                      'isearch-message-prefix))
-                                            "word ") "")
-                                    (if regexp-flag "regexp " "")
-                                    from-string " with "
-                                    next-replacement ".\n\n"
-                                    (substitute-command-keys
-                                     query-replace-help)))
-                           (with-current-buffer standard-output
-                             (help-mode))))
+                         (let ((display-buffer-overriding-action
+                                '(nil (inhibit-same-window . t))))
+                           (with-output-to-temp-buffer "*Help*"
+                             (princ
+                              (concat "Query replacing "
+                                      (if backward "backward " "")
+                                      (if delimited-flag
+                                          (or (and (symbolp delimited-flag)
+                                                   (get delimited-flag
+                                                        'isearch-message-prefix))
+                                              "word ") "")
+                                      (if regexp-flag "regexp " "")
+                                      from-string " with "
+                                      next-replacement ".\n\n"
+                                      (substitute-command-keys
+                                       query-replace-help)))
+                             (with-current-buffer standard-output
+                               (help-mode)))))
                         ((eq def 'exit)
                          (setq keep-going nil)
                          (setq done t))