Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org

[bpt/emacs.git] / lisp / replace.el

diff --git a/lisp/replace.el b/lisp/replace.el
index 24cfccf..be0ecda 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2156,7 +2156,10 @@ make, or the user didn't cancel the call."
                         (with-output-to-temp-buffer "*Help*"
                           (princ
                            (concat "Query replacing "
-                                   (if delimited-flag "word " "")
+                                   (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"