From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#74352: 29.4; emerge-files with tramp + local file fails Date: Sun, 17 Nov 2024 11:32:00 +0100 Message-ID: <87h686882n.fsf@gmx.de> References: <87ttc78j3n.fsf@gmx.de> Reply-To: Michael Albinus Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22764"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 74352@debbugs.gnu.org To: =?UTF-8?Q?J=C3=B6rg?= Sommer Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Nov 17 11:33:30 2024 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 1tCcav-0005pc-I3 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 17 Nov 2024 11:33:29 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tCcaW-0002sn-Kl; Sun, 17 Nov 2024 05:33:04 -0500 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 1tCcaU-0002sa-V0 for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2024 05:33:03 -0500 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 1tCcaU-0005de-Jh for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2024 05:33:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=j+3yz98/rdZro7Vsw6DpQCa/Jfh3WVssUftakF7vWR4=; b=Iia4TIc0E8pLtec9Axvs/tYtNhiUIgPl9wHf3aBJo3gURB3GhCySB5vOTBzXCQlj1s4ohIRL0jPTgQmlgkAS9z5E1TxjOj9qB60BB+F5Yg8nquR0tN/4/3FXE/7mhzAJlj0WfVsdQVSxuD1qXjMGTvTOsyfLpGyIUi5vWzH1LSvt/FI+A7g7NaaZvs5EKbJH1w8nLAvj+b3bBT/OyhgwZRq3hcGqExdIZHFIXwqvZnwOSsqOIH6O7oUT17vHb9agrva/DUYvH/Hr3snTzP25RCzrMBlhPqKUciUGOB8OGWvJ1TS0qXFDoTqyBfYXnuxgKpVEDW3wZyQQwnb9BHY1hA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tCcaU-0002JX-8L for bug-gnu-emacs@gnu.org; Sun, 17 Nov 2024 05:33:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 17 Nov 2024 10:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74352 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 74352-submit@debbugs.gnu.org id=B74352.17318395378840 (code B ref 74352); Sun, 17 Nov 2024 10:33:02 +0000 Original-Received: (at 74352) by debbugs.gnu.org; 17 Nov 2024 10:32:17 +0000 Original-Received: from localhost ([127.0.0.1]:56006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCcZk-0002IV-P7 for submit@debbugs.gnu.org; Sun, 17 Nov 2024 05:32:17 -0500 Original-Received: from mout.gmx.net ([212.227.17.22]:58109) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCcZi-0002II-PQ for 74352@debbugs.gnu.org; Sun, 17 Nov 2024 05:32:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1731839521; x=1732444321; i=michael.albinus@gmx.de; bh=j+3yz98/rdZro7Vsw6DpQCa/Jfh3WVssUftakF7vWR4=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Kc4XgHeYwcdvBup4FJV3y9Qbd+oMzDMyESMEvslLaEHKUXLNKHAy/8ryZM7Gjl03 tUxsCUhyKlXwBBTARfOmzlL39QPnwfjVjRhFqp2U90C684Gsi8N+UMpfZHPFskgoh yt8Rc25YuQaOyHFS8zzjPDHFE5YS1P7dp5JEAMqrlfqz9FBhkM5ovoNu7bjQjoYnX qqoW1YilA7CKVuHCLxH5spmNmdbNr89PigTfyaLp/+qA/PjE9+xtO/kT7p4P/Bs9V 282XaAQDT23GAhWyMeCqY6+m41yAuvyzTsMU/UsUjwb2RrGYQNer/rdJcmmnJtMg+ 4UIqpJxZAvZVguLGlQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M3lYB-1tCtYQ0hgh-001i5Y; Sun, 17 Nov 2024 11:32:01 +0100 In-Reply-To: ("=?UTF-8?Q?J=C3=B6rg?= Sommer"'s message of "Sun, 17 Nov 2024 11:10:47 +0100") X-Provags-ID: V03:K1:SYtZULA08FAIBX+DXBHu455dBAilJexqwG1SbLyqtF7w+JoTuVJ OsaFvntv0m6HspkNmVO6+gvZV+ATG88RMXbMCKF7R3+xCz8PceAtoRKT7EwjQ6H4T0QrySi 0qM8XlbtPaEn7yiAqczIvo3hwqOKS6mxwMI+XE/3AbESUIkioeyu9L7orDS/99enDAUq6TD V3+J6PyAOebdTlkQ8vjfA== UI-OutboundReport: notjunk:1;M01:P0:3URKj3Q1XuQ=;1lV/ESDxhNIxD/d5U1hkThGqsSV a3F5vESrjBtVE/TB4iJAbtBcXmjlszcmKUFJulZfOhWIlPfcwp28H0nZeab9jmV/K3Ct2ZZw0 mc5nsnnzax5wfmjnVdFpMx1kNnsJTfNY6QlFdZV8tGK/3tWV+/UobQ4dYoH8IETAOv0ejPi5+ lJsbVaLmqV3lFiN0+v/jQTkzFfgH/7CmZallm6h0KTLn1c/mz0HOyNpRelA/OzHAptYPXQ+1u 36CpeN9w8C6u8aGmYIXntx2wWww7qmZ8lgQvY8ADwgGykedBmCm1axIMYvR8bN13YfhqfAq0v esP6ThtZPYQlz+BRiaeLKDYqRUFs+aqVhXZh6g2JV2RK8qvvryr+2DkBZSw6I7MejYa1AMrLe IEI41uabfMzdGqcvZZyfy7oaYUMGXnWNL/zGShZdRvLDU1d9uLo/jPTMzBqvs332um24QcY2r ZEXNBdSiqmxJr0q9hlb9JKWbFc5orGT2RfVJIBw1CgzIopykr8I9xZwfw5wtufTjUNqa6Qkm6 mIIH7iscU/M5LeHhfDlITSlPaahl5I1EmuMhA6qiIlfOLW16R3eEeT1n1VVToDOUx6p+eu284 DB09jJ5PY3YkH0k1k+fZSqoV1IH+eL69Ux/rGryjoPX8IAsNuK9U8DeUZwTVeI+YGX59FZEiq OnV92IOJPbou5OhntvCmmn4I8nCU1DP6DwUgHhZEC5YYNiT0tGMqImN3qwAcL9VioGKFNXzdu EwTU7lkADFRZXK4QeE6DCOM7eCpzKo+b57X71P4fSot3B14YTRz7rHN8psDtgB9QK5BkCzca 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:295516 Archived-At: J=C3=B6rg Sommer writes: Hi Joerg, >> The point is, that emerge calls the 'diff' program for either the file >> itself (if local), or a local copy of the file (if remote). A consistent >> solution is therefore to set a local default directory, like >>=20 >> --8<---------------cut here---------------start------------->8--- >> (setq default-directory temporary-file-directory) >> --8<---------------cut here---------------end--------------->8--- >>=20 >> instead of your change. Would you like to check? > > This works. > > But in the context of *emerge-make-diff-list* it is not very apparent why > *temporary-file-directory* is used. Maybe a comment should say that > *emerge-files-internal* copied the files there by *file-local-copy*. Sure, it doesn't hurt :-) My patch is rather a proof of concept. It could be improved in all directio= ns. >> However, this won't be a complete solution. There are other places in >> emerge.el, where the temporary buffer for calling 'diff' must have a >> local default directory. > > Are you sure? I see only one usage of emerge-diff-program in emerge.el. There is also emerge-diff3-program, used in emerge-make-diff3-list. And there are also emerge-rcs-ci-program and emerge-rcs-co-program, used at different places. But I don't know whether they need special care. >> I'm not an emerge aficionado > > Out of curiosity: Is there a better tool? ediff-files, ediff-directories and ediff-revision. Because I use them all days, I've rebound some keys in my .emacs: --8<---------------cut here---------------start------------->8--- (require 'dired) (define-key dired-mode-map "=3D" 'ediff-files) (define-key dired-mode-map "\M-=3D" 'ediff-directories) (require 'vc) (define-key vc-prefix-map "=3D" 'ediff-revision) (setq ediff-diff-options "-a") (add-hook 'vc-dir-mode-hook (lambda () (define-key vc-dir-mode-map "=3D" 'ediff-revision))) --8<---------------cut here---------------end--------------->8--- Best regards, Michael.