From: Dmitry Gutov <dgutov@yandex.ru>
Date: Tue, 1 Dec 2020 01:46:27 +0000 (+0200)
Subject: Reset xref-show-xrefs-function temporarily
X-Git-Tag: emacs-27.1.90~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=749e4b7e0b04948f4805455e9505c6b855a84c96;p=emacs.git

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).
---

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)