From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#65854: Multi-file replacement diff Date: Tue, 12 Sep 2023 09:49:17 +0300 Organization: LINKOV.NET Message-ID: <86bke7q34y.fsf@mail.linkov.net> References: <86sf7mgd54.fsf@mail.linkov.net> <86bke943tp.fsf@mail.linkov.net> <86zg1t2m7j.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3491"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 65854@debbugs.gnu.org To: Eshel Yaron Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Sep 12 09:31:17 2023 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 1qfxrg-0000oO-TZ for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 12 Sep 2023 09:31:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfxrQ-0000rX-99; Tue, 12 Sep 2023 03:31:00 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfxrO-0000r7-5W for bug-gnu-emacs@gnu.org; Tue, 12 Sep 2023 03:30:58 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qfxrN-0005KI-Rs for bug-gnu-emacs@gnu.org; Tue, 12 Sep 2023 03:30:57 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfxrS-0006Wk-Ak for bug-gnu-emacs@gnu.org; Tue, 12 Sep 2023 03:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 12 Sep 2023 07:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65854 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 65854-submit@debbugs.gnu.org id=B65854.169450384425062 (code B ref 65854); Tue, 12 Sep 2023 07:31:02 +0000 Original-Received: (at 65854) by debbugs.gnu.org; 12 Sep 2023 07:30:44 +0000 Original-Received: from localhost ([127.0.0.1]:55968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxr9-0006WA-Sg for submit@debbugs.gnu.org; Tue, 12 Sep 2023 03:30:44 -0400 Original-Received: from relay1-d.mail.gandi.net ([2001:4b98:dc4:8::221]:38875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxr7-0006Vu-W3 for 65854@debbugs.gnu.org; Tue, 12 Sep 2023 03:30:42 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id 2CB06240048; Tue, 12 Sep 2023 07:29:24 +0000 (UTC) In-Reply-To: <86zg1t2m7j.fsf@mail.linkov.net> (Juri Linkov's message of "Mon, 11 Sep 2023 10:38:56 +0300") X-GND-Sasl: juri@linkov.net 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:270142 Archived-At: >> Yes, but what is the use case for generating the diff based on the >> contents on disk when the file is modified in Emacs? Basically, my >> suggestion is to check in `multi-file-replace-regexp-as-diff` if any of >> the matching files are visited by some buffer, and if so simply pass the >> buffer instead of the file name for that file to >> `multi-file-replace-as-diff`. That way you always get an up-to-date >> diff, and you don't need to manually check that you don't have any of >> the matching files open by any chance. Does that make sense? > > Thanks for the idea, this makes sense and will help to > reduce the number of commands from 2 to 1 by merging > multi-buffer-replace-regexp-as-diff with > multi-file-replace-regexp-as-diff. Actually, separate commands are still needed when we will add a command to show replacement diffs on the buffers marked on the buffer list from M-x list-buffers. But it seems we can't avoid the limitation that such buffers should be file-visiting. I see no way to generate a diff for non-file buffers because 'C-c C-a' from diff-mode needs a file name to apply the hunk to the file buffer. Also another useful command that probably will be used the most often is to show a replacement diff for the current buffer as a counterpart of query-replace: ``` diff --git a/lisp/misearch.el b/lisp/misearch.el index da70d708a9e..9aa639af5fe 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -500,6 +501,22 @@ multi-buffer-replace-regexp-as-diff (list buffers (nth 0 common) (nth 1 common) (nth 2 common)))) (multi-file-replace-as-diff buffers regexp to-string t delimited)) +;;;###autoload +(defun replace-regexp-as-diff (regexp to-string &optional delimited) + "Show replacements in the current file buffer matching REGEXP with TO-STRING as diff. +With a prefix argument, ask for a regexp, and replace in file buffers +whose names match the specified regexp." + (interactive + (let ((common + (query-replace-read-args + (concat "Replace" + (if current-prefix-arg " word" "") + " regexp as diff in buffers") + t t))) + (list (nth 0 common) (nth 1 common) (nth 2 common)))) + (multi-file-replace-as-diff + (list (current-buffer)) regexp to-string t delimited)) + (defvar unload-function-defs-list) ```