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: Mon, 11 Sep 2023 09:33:06 +0300 Organization: LINKOV.NET Message-ID: <86bke943tp.fsf@mail.linkov.net> References: <86sf7mgd54.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="15315"; 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 Mon Sep 11 08:35:18 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 1qfaVx-0003pC-U8 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 11 Sep 2023 08:35:17 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfaVg-0003xE-Nq; Mon, 11 Sep 2023 02:35: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 1qfaVe-0003wO-Om for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2023 02:34: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 1qfaVe-00032H-4d for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2023 02:34:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfaVh-0005sc-WC for bug-gnu-emacs@gnu.org; Mon, 11 Sep 2023 02:35: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: Mon, 11 Sep 2023 06:35:01 +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.169441409222582 (code B ref 65854); Mon, 11 Sep 2023 06:35:01 +0000 Original-Received: (at 65854) by debbugs.gnu.org; 11 Sep 2023 06:34:52 +0000 Original-Received: from localhost ([127.0.0.1]:51950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfaVX-0005sA-Kl for submit@debbugs.gnu.org; Mon, 11 Sep 2023 02:34:51 -0400 Original-Received: from relay5-d.mail.gandi.net ([217.70.183.197]:50085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfaVU-0005rv-BE for 65854@debbugs.gnu.org; Mon, 11 Sep 2023 02:34:50 -0400 Original-Received: by mail.gandi.net (Postfix) with ESMTPSA id AB00B1C0013; Mon, 11 Sep 2023 06:34:36 +0000 (UTC) In-Reply-To: (Eshel Yaron's message of "Sun, 10 Sep 2023 19:58:10 +0200") 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:270024 Archived-At: >> +(defun multi-file-replace-as-diff (files-or-buffers from-string replacements regexp-flag delimited-flag) >> + (require 'diff) >> + (let ((inhibit-message t) >> + (diff-buffer (get-buffer-create "*replace-diff*"))) >> + (with-current-buffer diff-buffer >> + (buffer-disable-undo (current-buffer)) >> + (let ((inhibit-read-only t)) >> + (erase-buffer)) >> + (diff-mode)) >> + (dolist (file-or-buffer files-or-buffers) >> + (let ((file-name (if (bufferp file-or-buffer) buffer-file-name file-or-buffer))) >> + (when file-name >> + (with-temp-buffer >> + (if (bufferp file-or-buffer) >> + (insert-buffer-substring file-or-buffer) >> + (insert-file-contents file-or-buffer)) > > I wonder what happens if I call `multi-file-replace-regexp-as-diff` and > select a file `foo.txt`, that I already have open and modified in a > buffer. IIUC, this will generate the diff based on the contents of the > file on disk, not the buffer, so it might not match when I subsequently > try to apply the diff to the buffer. WDYT? For such cases you can use multi-buffer-replace-regexp-as-diff from this patch instead of multi-file-replace-regexp-as-diff. The former generates the diff based on the contents of the file in the buffer, the latter uses the contents on disk.