diff options
| author | Juri Linkov | 2016-05-04 23:05:33 +0300 |
|---|---|---|
| committer | Juri Linkov | 2016-05-04 23:05:33 +0300 |
| commit | 3fe351072841becbb1902c19f784890949f41c1d (patch) | |
| tree | cf47823b1e70a384c630467899430c13e44ca4bb /lisp | |
| parent | 0932b948971770201b135d5f0dee82b91a1eef92 (diff) | |
| download | emacs-3fe351072841becbb1902c19f784890949f41c1d.tar.gz emacs-3fe351072841becbb1902c19f784890949f41c1d.zip | |
* lisp/replace.el (query-replace-read-from): Use minibuffer-with-setup-hook
to set minibuffer-local value of text-property-default-nonsticky.
(Bug#23418, bug#23127)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/replace.el | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 801c6058f74..26e5875dc08 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -191,18 +191,15 @@ wants to replace FROM with TO." | |||
| 191 | ;; a region in order to specify the minibuffer input. | 191 | ;; a region in order to specify the minibuffer input. |
| 192 | ;; That should not clobber the region for the query-replace itself. | 192 | ;; That should not clobber the region for the query-replace itself. |
| 193 | (save-excursion | 193 | (save-excursion |
| 194 | ;; The `with-current-buffer' ensures that the binding | 194 | (minibuffer-with-setup-hook |
| 195 | ;; for `text-property-default-nonsticky' isn't a buffer | 195 | (lambda () |
| 196 | ;; local binding in the current buffer, which | 196 | (setq-local text-property-default-nonsticky |
| 197 | ;; `read-from-minibuffer' wouldn't see. | 197 | (cons '(separator . t) text-property-default-nonsticky))) |
| 198 | (with-current-buffer (window-buffer (minibuffer-window)) | 198 | (if regexp-flag |
| 199 | (let ((text-property-default-nonsticky | 199 | (read-regexp prompt nil 'query-replace-from-to-history) |
| 200 | (cons '(separator . t) text-property-default-nonsticky))) | 200 | (read-from-minibuffer |
| 201 | (if regexp-flag | 201 | prompt nil nil nil 'query-replace-from-to-history |
| 202 | (read-regexp prompt nil 'query-replace-from-to-history) | 202 | (car (if regexp-flag regexp-search-ring search-ring)) t))))) |
| 203 | (read-from-minibuffer | ||
| 204 | prompt nil nil nil 'query-replace-from-to-history | ||
| 205 | (car (if regexp-flag regexp-search-ring search-ring)) t)))))) | ||
| 206 | (to)) | 203 | (to)) |
| 207 | (if (and (zerop (length from)) query-replace-defaults) | 204 | (if (and (zerop (length from)) query-replace-defaults) |
| 208 | (cons (caar query-replace-defaults) | 205 | (cons (caar query-replace-defaults) |