summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2020-12-01 03:46:27 +0200
committerDmitry Gutov <dgutov@yandex.ru>2020-12-01 03:46:27 +0200
commit749e4b7e0b04948f4805455e9505c6b855a84c96 (patch)
tree3807d2b951d23189e5d26f22143bc46f7751a9d3
parent3e6525d69f0de68fe2305f8e2102c8a5ce42f671 (diff)
downloademacs-749e4b7e0b04948f4805455e9505c6b855a84c96.tar.gz
Reset xref-show-xrefs-function temporarily
* lisp/dired-aux.el (dired-do-find-regexp-and-replace): Make sure xref-show-xrefs-function has the necessary value (bug#44905).
-rw-r--r--lisp/dired-aux.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7f988540c2c..18fb4b0b8b0 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -3023,7 +3023,13 @@ REGEXP should use constructs supported by your local `grep' command."
(query-replace-read-args
"Query replace regexp in marked files" t t)))
(list (nth 0 common) (nth 1 common))))
- (with-current-buffer (dired-do-find-regexp from)
+ (require 'xref)
+ (defvar xref-show-xrefs-function)
+ (with-current-buffer
+ (let ((xref-show-xrefs-function
+ ;; Some future-proofing (bug#44905).
+ (eval (car (get 'xref-show-xrefs-function 'standard-value)))))
+ (dired-do-find-regexp from))
(xref-query-replace-in-results from to)))
(defun dired-nondirectory-p (file)