From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#44905: 27.1; Packages that customize xref-show-xrefs-function can break Dired's dired-do-find-regexp-and-replace Date: Mon, 30 Nov 2020 17:26:57 +0200 Message-ID: <835z5mlvb2.fsf@gnu.org> References: <7ab2afb1-33ec-bca0-4014-131130e71a04@yandex.ru> <808e5fa8-9a5f-766e-39b0-c68da53b0d50@yandex.ru> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23285"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 44905@debbugs.gnu.org, mardani29@yahoo.es To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 30 16:28:15 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kjl66-0005rg-Bp for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Nov 2020 16:28:14 +0100 Original-Received: from localhost ([::1]:35928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjl64-0005Vn-W0 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Nov 2020 10:28:13 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjl5u-0005Va-6v for bug-gnu-emacs@gnu.org; Mon, 30 Nov 2020 10:28:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjl5u-0003SJ-05 for bug-gnu-emacs@gnu.org; Mon, 30 Nov 2020 10:28:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjl5t-0002FM-So for bug-gnu-emacs@gnu.org; Mon, 30 Nov 2020 10:28:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 30 Nov 2020 15:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44905 X-GNU-PR-Package: emacs Original-Received: via spool by 44905-submit@debbugs.gnu.org id=B44905.16067500348581 (code B ref 44905); Mon, 30 Nov 2020 15:28:01 +0000 Original-Received: (at 44905) by debbugs.gnu.org; 30 Nov 2020 15:27:14 +0000 Original-Received: from localhost ([127.0.0.1]:56285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjl58-0002EL-ET for submit@debbugs.gnu.org; Mon, 30 Nov 2020 10:27:14 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:49104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjl56-0002E7-VX for 44905@debbugs.gnu.org; Mon, 30 Nov 2020 10:27:13 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:57569) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjl51-0003BI-1A; Mon, 30 Nov 2020 10:27:07 -0500 Original-Received: from [176.228.60.248] (port=3504 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kjl4z-0007Q4-MK; Mon, 30 Nov 2020 10:27:06 -0500 In-Reply-To: <808e5fa8-9a5f-766e-39b0-c68da53b0d50@yandex.ru> (message from Dmitry Gutov on Mon, 30 Nov 2020 03:00:17 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:194638 Archived-At: > Cc: 44905@debbugs.gnu.org, Eli Zaretskii > From: Dmitry Gutov > 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.