From: Michael Albinus via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: "Jörg Sommer" <joerg@jo-so.de>
Cc: 74352@debbugs.gnu.org
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Date: Fri, 10 Jan 2025 09:14:03 +0100 [thread overview]
Message-ID: <87jzb384s4.fsf@gmx.de> (raw)
In-Reply-To: <87h686882n.fsf@gmx.de> (Michael Albinus's message of "Sun, 17 Nov 2024 11:32:00 +0100")
Michael Albinus <michael.albinus@gmx.de> 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
>>>
>>> --8<---------------cut here---------------start------------->8---
>>> (setq default-directory temporary-file-directory)
>>> --8<---------------cut here---------------end--------------->8---
>>>
>>> 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 directions.
>
>>> 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 lost control. Are you still working on a patch?
Best regards, Michael.
prev parent reply other threads:[~2025-01-10 8:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-13 19:11 bug#74352: 29.4; emerge-files with tramp + local file fails Jörg Sommer
2024-11-14 7:05 ` Eli Zaretskii
2024-11-14 17:27 ` Jörg Sommer
2024-11-14 8:10 ` Michael Albinus via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-11-16 12:21 ` Michael Albinus via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-11-17 10:10 ` Jörg Sommer
2024-11-17 10:32 ` Michael Albinus via Bug reports for GNU Emacs, the Swiss army knife of text editors
2025-01-10 8:14 ` Michael Albinus via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87jzb384s4.fsf@gmx.de \
--to=bug-gnu-emacs@gnu.org \
--cc=74352@debbugs.gnu.org \
--cc=joerg@jo-so.de \
--cc=michael.albinus@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).