From: Dmitry Gutov <dgutov@yandex.ru>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 44905-done@debbugs.gnu.org, mardani29@yahoo.es
Subject: bug#44905: 27.1; Packages that customize xref-show-xrefs-function can break Dired's dired-do-find-regexp-and-replace
Date: Tue, 1 Dec 2020 03:50:17 +0200 [thread overview]
Message-ID: <30fac4c6-be23-aab5-503f-77a750dd8044@yandex.ru> (raw)
In-Reply-To: <835z5mlvb2.fsf@gnu.org>
Version: 27.2
On 30.11.2020 17:26, Eli Zaretskii wrote:
>> Cc: 44905@debbugs.gnu.org, Eli Zaretskii <eliz@gnu.org>
>> From: Dmitry Gutov <dgutov@yandex.ru>
>> Date: Mon, 30 Nov 2020 03:00:17 +0200
>>
>>>> diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
>>>> index 94a2bbf1f3..4caafc8df6 100644
>>>> --- a/lisp/dired-aux.el
>>>> +++ b/lisp/dired-aux.el
>>>> @@ -3140,7 +3140,10 @@ dired-do-find-regexp-and-replace
>>>> (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)
>>>> + (defvar xref-show-xrefs-function)
>>>> + (with-current-buffer
>>>> + (let ((xref-show-xrefs-function 'xref--show-xref-buffer))
>>>> + (dired-do-find-regexp from))
>>>> (xref-query-replace-in-results from to)))
>>>>
>>>> (defun dired-nondirectory-p (file)
>>>
>>> LGTM, thanks.
>>
>> Eli, is this OK for Emacs 27.2?
>
> Yes, thanks.
>
>> Here's also a slightly more future-proofed version that avoids
>> referencing the function we might want to rename/change later:
>
> That, too.
Thanks.
Pushed to the release branch (will get merged to master in due time),
commit 749e4b7e0b.
prev parent reply other threads:[~2020-12-01 1:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <m1zh32imkw.fsf.ref@yahoo.es>
2020-11-27 20:14 ` bug#44905: 27.1; Packages that customize xref-show-xrefs-function can break Dired's dired-do-find-regexp-and-replace Unknown
2020-11-28 19:04 ` Dmitry Gutov
2020-11-29 12:57 ` Unknown
2020-11-30 1:00 ` Dmitry Gutov
2020-11-30 15:26 ` Eli Zaretskii
2020-12-01 1:50 ` Dmitry Gutov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30fac4c6-be23-aab5-503f-77a750dd8044@yandex.ru \
--to=dgutov@yandex.ru \
--cc=44905-done@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=mardani29@yahoo.es \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.