From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov 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: Tue, 1 Dec 2020 03:50:17 +0200 Message-ID: <30fac4c6-be23-aab5-503f-77a750dd8044@yandex.ru> References: <7ab2afb1-33ec-bca0-4014-131130e71a04@yandex.ru> <808e5fa8-9a5f-766e-39b0-c68da53b0d50@yandex.ru> <835z5mlvb2.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19231"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 Cc: 44905-done@debbugs.gnu.org, mardani29@yahoo.es To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Dec 01 02:51:28 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 1kjupD-0004sk-Db for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 01 Dec 2020 02:51:27 +0100 Original-Received: from localhost ([::1]:45956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjupC-0003BQ-DE for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 30 Nov 2020 20:51:26 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjuot-0003AA-KQ for bug-gnu-emacs@gnu.org; Mon, 30 Nov 2020 20:51:07 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45682) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjuoo-0007CZ-GF for bug-gnu-emacs@gnu.org; Mon, 30 Nov 2020 20:51:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjuoo-0007mi-D2 for bug-gnu-emacs@gnu.org; Mon, 30 Nov 2020 20:51:02 -0500 Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Tue, 01 Dec 2020 01:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 44905 X-GNU-PR-Package: emacs Mail-Followup-To: 44905@debbugs.gnu.org, dgutov@yandex.ru, mardani29@yahoo.es Original-Received: via spool by 44905-done@debbugs.gnu.org id=D44905.160678742829879 (code D ref 44905); Tue, 01 Dec 2020 01:51:02 +0000 Original-Received: (at 44905-done) by debbugs.gnu.org; 1 Dec 2020 01:50:28 +0000 Original-Received: from localhost ([127.0.0.1]:57228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjuoF-0007lr-Qr for submit@debbugs.gnu.org; Mon, 30 Nov 2020 20:50:28 -0500 Original-Received: from mail-ej1-f41.google.com ([209.85.218.41]:33806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjuoE-0007le-Lh for 44905-done@debbugs.gnu.org; Mon, 30 Nov 2020 20:50:27 -0500 Original-Received: by mail-ej1-f41.google.com with SMTP id s13so620586ejr.1 for <44905-done@debbugs.gnu.org>; Mon, 30 Nov 2020 17:50:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=OvU2kQYj6rnouJz5WPVU99eaN0nRpkJNzr7bMu6wz/I=; b=VNnczpd5uxCu+SecH4dMmjfu2XxdG1K5EsAW3vZ6xjUmswJCg7lYalcNe6Q/Iz9Lu8 1qAqNXCMq7JV6Fiw4Jmnys33pv0xeFErSG4amgeU6hjUlzHAmtx6v0Fr6XY3fgvNB+BO nklJFQ26EzbbnF1rweJQlnFTe3rRNkN3ka1BFr44sNmEVNepreJfKVNZMx+92LyVxtp9 iaCG0k8sdahHCUl35q8UTXggK/XIPICcTQ4n7uOlqF+OLOTh48t19JO4siMTkmGeVQvh 7ptIU6UXL1DTUFbadFeTUbOyTAxmIYWkhJ7K9+dlqVOCX9DRrpEfvXE6eYKO0v8eGy7g aN9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=OvU2kQYj6rnouJz5WPVU99eaN0nRpkJNzr7bMu6wz/I=; b=p/WaVQ6IZCTh8ob3vKQFV5Q+oHH85Qu8H9cw/UMQEZCqNVhgxKgO+vfUi6Ydq5HkYS b8VmYjyf2XZWJ3or6I/Jjx8dSrmBHElaVZqfLgYjTkT4kf+6a2jgMVQHGMFpm30TP06x CWQ5Vfj0VYcOXVsyajlq/VmPVD3qzijOZwOKopqxsSewJzs+lx7K61A9TvpQbNgGZH0L KD/I7Lz8iaqDfErxWznUFEphgLcidsncS/RE39gLRQznAnqeZlmT9LWGcRGNmhjTop5m qqibMxWBahqznp3RqshHO6pFaMAYFfM1bdTXO4KU6msxx39OuKXzGWRqo6ALoddAKfC9 zWJg== X-Gm-Message-State: AOAM5334gnjWuuML0xY6x7AZoj79EEN8zRp1Hg8FsaCu8KQZptFoOv14 Ikzoykjdw9aSJuW50E9nMKA= X-Google-Smtp-Source: ABdhPJyP3Quu7/9W+yVFQH3pFpbzSjmnXuJSr5XRwV6U3WgstMIbTMb1TyI78yAW/+kwuuF8heAJpg== X-Received: by 2002:a17:906:dc4:: with SMTP id p4mr801662eji.56.1606787420733; Mon, 30 Nov 2020 17:50:20 -0800 (PST) Original-Received: from [192.168.0.4] ([66.205.71.3]) by smtp.googlemail.com with ESMTPSA id o33sm69058edd.50.2020.11.30.17.50.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Nov 2020 17:50:19 -0800 (PST) In-Reply-To: <835z5mlvb2.fsf@gnu.org> Content-Language: en-US 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:194696 Archived-At: Version: 27.2 On 30.11.2020 17:26, Eli Zaretskii wrote: >> 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. Thanks. Pushed to the release branch (will get merged to master in due time), commit 749e4b7e0b.