1 files changed, 7 insertions, 3 deletions

diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 3c307625059..b710df35f66 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -926,9 +926,13 @@ the query replace mode will toggle between string replace and regexp replace."
                            (if vip-re-replace "regexp replace"
                              "string replace"))))
       (if vip-re-replace
-          (replace-regexp
-           str
-           (vip-read-string (format "Replace regexp \"%s\" with: " str)))
+          ;; (replace-regexp
+          ;;  str
+          ;;  (vip-read-string (format "Replace regexp \"%s\" with: " str)))
+          (while (re-search-forward str nil t)
+            (replace-match (vip-read-string
+                            (format "Replace regexp \"%s\" with: " str))
+                           nil nil))
         (replace-string
          str
          (vip-read-string (format "Replace \"%s\" with: " str)))))))