mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

Revert prompting changes in viper-cmd

Browse Source 
* 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.
This commit is contained in:
Lars Ingebrigtsen 2022-04-19 13:48:06 +02:00
parent 1030cc1897
commit 91d4898d5c
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lisp/emulation/viper-cmd.el
View File

@ -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