emacs-28 91d4898d5c: Revert prompting changes in viper-cmd

[Lars Ingebrigtsen]

branch: emacs-28
commit 91d4898d5cceddd80456b6ce57ce2c5392aa1281
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Revert prompting changes in viper-cmd
    
    * lisp/emulation/viper-cmd.el (viper-quote-region)
    (viper-read-string-with-history, viper-query-replace): Revert
    prompting changes done in 50512e3 -- the way viper prompts in
    command mode is special (bug#55007).
    
    Do not merge to master.
---
 lisp/emulation/viper-cmd.el | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 2740a5b3e5..1f2f3ecfc3 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1786,7 +1786,7 @@ Undo previous insertion and inserts new."
        (do-not-change-default t))
     (setq quote-str
          (viper-read-string-with-history
-          "Quote string"
+          "Quote string: "
           nil
           'viper-quote-region-history
            ;; FIXME: Use comment-region.
@@ -1995,17 +1995,24 @@ problems."
            #'viper-minibuffer-standard-hook
            (if (or (not (listp old)) (eq (car old) 'lambda))
                (list old) old))))
-       (val ""))
+       (val "")
+       (padding "")
+       temp-msg)
 
     (setq keymap (or keymap minibuffer-local-map)
          initial (or initial "")
-         viper-initial initial)
+         viper-initial initial
+         temp-msg (if default
+                      (format "(default %s) " default)
+                    ""))
 
     (setq viper-incomplete-ex-cmd nil)
-    (setq val (read-from-minibuffer (format-prompt prompt default)
-                                   nil
-                                   keymap nil history-var default))
-    (setq minibuffer-setup-hook nil)
+    (setq val (read-from-minibuffer prompt
+                                   (concat temp-msg initial val padding)
+                                   keymap nil history-var))
+    (setq minibuffer-setup-hook nil
+         padding (viper-array-to-string (this-command-keys))
+         temp-msg "")
     ;; the following tries to be smart about what to put in history
     (if (not (string= val (car (symbol-value history-var))))
        (push val (symbol-value history-var)))
@@ -3819,7 +3826,7 @@ Null string will repeat previous search."
   (let (buffer buffer-name)
     (setq buffer-name
          (funcall viper-read-buffer-function
-                  (format-prompt "Kill buffer"
+                  (format "Kill buffer (%s): "
                           (buffer-name (current-buffer)))))
     (setq buffer
          (if (null buffer-name)
@@ -4165,8 +4172,8 @@ and regexp replace."
   (interactive)
   (let (str)
     (setq str (viper-read-string-with-history
-              (if viper-re-query-replace "Query replace regexp"
-                "Query replace")
+              (if viper-re-query-replace "Query replace regexp: "
+                "Query replace: ")
               nil  ; no initial
               'viper-replace1-history
               (car viper-replace1-history) ; default
@@ -4181,7 +4188,7 @@ and regexp replace."
          (query-replace-regexp
           str
           (viper-read-string-with-history
-           (format-message "Query replace regexp `%s' with" str)
+           (format-message "Query replace regexp `%s' with: " str)
            nil  ; no initial
            'viper-replace1-history
            (car viper-replace1-history) ; default
@@ -4189,7 +4196,7 @@ and regexp replace."
        (query-replace
         str
         (viper-read-string-with-history
-         (format-message "Query replace `%s' with" str)
+         (format-message "Query replace `%s' with: " str)
          nil  ; no initial
          'viper-replace1-history
          (car viper-replace1-history) ; default