diff options
| author | Juri Linkov <juri@linkov.net> | 2016-05-04 23:05:33 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2016-05-04 23:05:33 +0300 |
| commit | 3fe351072841becbb1902c19f784890949f41c1d (patch) | |
| tree | cf47823b1e70a384c630467899430c13e44ca4bb | |
| parent | 0932b948971770201b135d5f0dee82b91a1eef92 (diff) | |
| download | emacs-3fe351072841becbb1902c19f784890949f41c1d.tar.gz | |
* 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)
| -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." ;; a region in order to specify the minibuffer input. ;; That should not clobber the region for the query-replace itself. (save-excursion - ;; The `with-current-buffer' ensures that the binding - ;; for `text-property-default-nonsticky' isn't a buffer - ;; local binding in the current buffer, which - ;; `read-from-minibuffer' wouldn't see. - (with-current-buffer (window-buffer (minibuffer-window)) - (let ((text-property-default-nonsticky - (cons '(separator . t) text-property-default-nonsticky))) - (if regexp-flag - (read-regexp prompt nil 'query-replace-from-to-history) - (read-from-minibuffer - prompt nil nil nil 'query-replace-from-to-history - (car (if regexp-flag regexp-search-ring search-ring)) t)))))) + (minibuffer-with-setup-hook + (lambda () + (setq-local text-property-default-nonsticky + (cons '(separator . t) text-property-default-nonsticky))) + (if regexp-flag + (read-regexp prompt nil 'query-replace-from-to-history) + (read-from-minibuffer + prompt nil nil nil 'query-replace-from-to-history + (car (if regexp-flag regexp-search-ring search-ring)) t))))) (to)) (if (and (zerop (length from)) query-replace-defaults) (cons (caar query-replace-defaults) |