mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/replace.el (query-replace-from-to-separator): Move propertize

Browse source 
and char-displayable-p test to query-replace-read-from.
Add choice nil to disable this feature.
(query-replace-read-from): Don't reevaluate custom setting.
Use char-displayable-p to test the first non-whitespace character
in query-replace-from-to-separator, use " -> " when fails.
Add prompt for the case when separator is nil but
query-replace-defaults is non-nil.
Remove unused test for regexp-flag.
Thanks to Thierry Volpiatto <thierry.volpiatto@gmail.com>
This commit is contained in:
Juri Linkov 2017-02-13 02:37:52 +02:00
parent a84da83c1a
commit d8cca4d8c5
1 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lisp/replace.el
View file

@ -79,15 +79,14 @@ That becomes the \"string to replace\".")
to the minibuffer that reads the string to replace, or invoke replacements
from Isearch by using a key sequence like `C-s C-s M-%'." "24.3")
(defcustom query-replace-from-to-separator
(propertize (if (char-displayable-p ?→) " → " " -> ")
'face 'minibuffer-prompt)
"String that separates FROM and TO in the history of replacement pairs."
;; Avoids error when attempt to autoload char-displayable-p fails
;; while preparing to dump, also stops customize-rogue listing this.
:initialize 'custom-initialize-delay
(defcustom query-replace-from-to-separator " → "
"String that separates FROM and TO in the history of replacement pairs.
When nil, the pair will not be added to the history (same behavior
as in emacs 24.5)."
:group 'matching
:type '(choice string (sexp :tag "Display specification"))
:type '(choice
(const :tag "Disabled" nil)
string)
:version "25.1")
(defcustom query-replace-from-history-variable 'query-replace-history
@ -165,14 +164,18 @@ The return value can also be a pair (FROM . TO) indicating that the user
wants to replace FROM with TO."
(if query-replace-interactive
(car (if regexp-flag regexp-search-ring search-ring))
;; Reevaluating will check char-displayable-p that is
;; unavailable while preparing to dump.
(custom-reevaluate-setting 'query-replace-from-to-separator)
(let* ((history-add-new-input nil)
(separator
(when query-replace-from-to-separator
(propertize "\0"
'display query-replace-from-to-separator
'display
(propertize
(if (char-displayable-p
(string-to-char (replace-regexp-in-string
" " "" query-replace-from-to-separator)))
query-replace-from-to-separator
" -> ")
'face 'minibuffer-prompt)
'separator t)))
(minibuffer-history
(append
@ -185,9 +188,13 @@ wants to replace FROM with TO."
(symbol-value query-replace-from-history-variable)))
(minibuffer-allow-text-properties t) ; separator uses text-properties
(prompt
(if (and query-replace-defaults separator)
(format "%s (default %s): " prompt (car minibuffer-history))
(format "%s: " prompt)))
(cond ((and query-replace-defaults separator)
(format "%s (default %s): " prompt (car minibuffer-history)))
(query-replace-defaults
(format "%s (default %s -> %s): " prompt
(query-replace-descr (caar query-replace-defaults))
(query-replace-descr (cdar query-replace-defaults))))
(t (format "%s: " prompt))))
(from
;; The save-excursion here is in case the user marks and copies
;; a region in order to specify the minibuffer input.
@ -200,8 +207,7 @@ wants to replace FROM with TO."
(if regexp-flag
(read-regexp prompt nil 'minibuffer-history)
(read-from-minibuffer
prompt nil nil nil nil
(car (if regexp-flag regexp-search-ring search-ring)) t)))))
prompt nil nil nil nil (car search-ring) t)))))
(to))
(if (and (zerop (length from)) query-replace-defaults)
(cons (caar query-replace-defaults)