Mercurial > emacs
changeset 71125:21306dd42b3c
(query-replace-read-from, query-replace-read-to):
Bind `history-add-new-input' to nil. Call `add-to-history'.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Wed, 31 May 2006 22:48:31 +0000 |
| parents | a85189d6eb4c |
| children | 36bd73d4707b |
| files | lisp/replace.el |
| diffstat | 1 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/replace.el Wed May 31 22:46:20 2006 +0000 +++ b/lisp/replace.el Wed May 31 22:48:31 2006 +0000 @@ -99,7 +99,8 @@ wants to replace FROM with TO." (if query-replace-interactive (car (if regexp-flag regexp-search-ring search-ring)) - (let ((from + (let* ((history-add-new-input nil) + (from ;; The save-excursion here is in case the user marks and copies ;; a region in order to specify the minibuffer input. ;; That should not clobber the region for the query-replace itself. @@ -117,6 +118,7 @@ (cons (car query-replace-defaults) (query-replace-compile-replacement (cdr query-replace-defaults) regexp-flag)) + (add-to-history query-replace-from-history-variable from nil t) ;; Warn if user types \n or \t, but don't reject the input. (and regexp-flag (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from) @@ -174,10 +176,12 @@ "Query and return the `to' argument of a query-replace operation." (query-replace-compile-replacement (save-excursion - (let ((to (read-from-minibuffer - (format "%s %s with: " prompt (query-replace-descr from)) - nil nil nil - query-replace-to-history-variable from t))) + (let* ((history-add-new-input nil) + (to (read-from-minibuffer + (format "%s %s with: " prompt (query-replace-descr from)) + nil nil nil + query-replace-to-history-variable from t))) + (add-to-history query-replace-to-history-variable to nil t) (setq query-replace-defaults (cons from to)) to)) regexp-flag))