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: Fri, 10 Jan 2025 09:14:03 +0100 Message-ID: <87jzb384s4.fsf@gmx.de> References: <87ttc78j3n.fsf@gmx.de> <87h686882n.fsf@gmx.de> Reply-To: Michael Albinus Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4087"; 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 Fri Jan 10 09:15:27 2025 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 1tWAAx-0000sf-Ap for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 10 Jan 2025 09:15:27 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tWAAb-0007Se-7w; Fri, 10 Jan 2025 03:15:05 -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 1tWAAZ-0007Qz-JR for bug-gnu-emacs@gnu.org; Fri, 10 Jan 2025 03:15: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 1tWAAZ-0007HZ-8f for bug-gnu-emacs@gnu.org; Fri, 10 Jan 2025 03:15:03 -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=KBp+FgI+9AqRQUFnbEJNzySfCl7EDmEdsHL1RL8ne6w=; b=Pa4ikNs+rpEdeuvRUSCkS+Dyi0xaccYysepP/I7Yq2cZqrI1sGlzey4L/hEK93Tlkp/pMqva9nPV0B/3/ZnKP3JIU9qmJIbdb6cSsE3PR1VGCjQTBH/kvyNZyvEZJSZj8SGyA6GlCYD9Rfd8zq/Bi2M/o2EyKU8vFjTEdI9+GJ+V7/idqDG9FlA1rEm0aV1BMqA1gZOj39SQ40/0yAptQfnMBHMEsRwXrfOpyO966Of0eO5XAFWdNuu4AjiOFKV4g99BDN1xDOjCo4+lKr4tCR74UaU64ArVMmnWEQgM/x5yB12CUgEReyVLCICkKFy7TVtPkaJXGIYsQ8N2XA6u4A==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tWAAY-0003eH-Ko for bug-gnu-emacs@gnu.org; Fri, 10 Jan 2025 03:15: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: Fri, 10 Jan 2025 08:15: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.173649685713941 (code B ref 74352); Fri, 10 Jan 2025 08:15:02 +0000 Original-Received: (at 74352) by debbugs.gnu.org; 10 Jan 2025 08:14:17 +0000 Original-Received: from localhost ([127.0.0.1]:56317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tWA9o-0003cm-Kc for submit@debbugs.gnu.org; Fri, 10 Jan 2025 03:14:16 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:37615) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tWA9m-0003cV-1D for 74352@debbugs.gnu.org; Fri, 10 Jan 2025 03:14:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1736496845; x=1737101645; i=michael.albinus@gmx.de; bh=KBp+FgI+9AqRQUFnbEJNzySfCl7EDmEdsHL1RL8ne6w=; 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=YmtlcNn3tuBkTlz/2ppH2rtXh3bRBnT8tc9YXNIcabAXYspGvm3tubpWcmQFf9T1 TR3piJyGGv7mCKHjWW0xrqpYE0clhpxyAHPVNy2Azq26Nl8maP4qDYorphv5mT8gC NCeVO5MQWlWljw5XAbOskQ4B3R4CWFeY/I0zT0YPyl5H9UgI6gV3uuz3xeKeMgzep lmlKKxh2EcwanqQZ6Se5bZa7KdL6wXNXm3y+gEoMFO32iS4OSqbIkmq4EPPNesq80 9o0aOKh2+wC31VK+VJ6H4eau27MXKB7g1LjutJHSPFXt/VDbm0UZJhxJfmaG1TasQ aCqA/Ctr4V2aNeV6jA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mwwdf-1tLluY0QlH-012gPL; Fri, 10 Jan 2025 09:14:05 +0100 In-Reply-To: <87h686882n.fsf@gmx.de> (Michael Albinus's message of "Sun, 17 Nov 2024 11:32:00 +0100") X-Provags-ID: V03:K1:NajscvPSY9G/wCCbx/2CETiILrHZg4O7IMCg5FsQj8SAl3twvHs bM817FqMldSNmkQ0B9REpHRwFVDyA9meH6ltr5I1sa/Giw4v/xu6ZuE3wzk74+aAgFg2pLH w3yLx9xsFRB72UdXBe1AB699v68BvWzd17gmV6F6DFNM4F0ZntkzfxlLkFwQ4yEo+d5XDVa l1sMzOKyHBDiHGZtv0h9g== UI-OutboundReport: notjunk:1;M01:P0:kuIqJYbGcX4=;M5MAltBIrRHcRA8PtHC7jIs4oHJ Nm1kEcaRsroclZozbgNicLERX719u3omTfYgrsVr4sEAf+51IBvUpB6Z41PdL/wYh79JyVfzq QCwalHqwD9Y/8T7U+LxF917HB9KRwkhVp84boX4bu+IfXMKLm+XDYyVRzLCYfGAjQjsOonJeP daAotK+wrkJKlEJxQkB7gmphgq9V8nmQTRak2G4kVAVpAWRMy+YlnuGA5lyY4U8coWJKhzuTM nbg0jNgOzOQQXLbd1ESw4NUCml8dcXjKQ1wUOLJu+XaET+O98x9z8+GYM4BV9OZwDxu4o4Bgw sFRvVdm9aJBgwOUYILBUBgYmJ3XiEhPGZJY9an6B3K9i3v/IXEfxIWQOrI/VHm2FgG1KYDMC7 5/qU7Taq45jCm5XNp1s1izdBXqSg5e1uYLRc9/4eDverXRfM2DvgrmIVz27pIjBPA3QiEycDG bxBsXJSxM1a27ttfgpCUbvHFUHJejvZ9GLAuI09opw6x0cqbOi/4vd66j3azxZoMszbzbIya8 T+WaNVONdQ3B5XbiGQ26k3bqX6HqSBQsYHhrUeDu/VvBPRqsnSWNxcgbvEayxYyUm7+EJub2q TNlSHlG/vW4R6mWeVhtOeZbINMi5BEYuyEOTQNIxuubeSr6XEVUhCzBW4UJi1FqiKaEqLrzMX DrTUyKt+c9zQ3wtpNYemO6fWe6918Lfmu9U7/CcO1e22Dqi8kwBnauIqFoHLgYvrDqtPuomqE 9Wjp4ztSfs+Fq6RiFoC6foTdt/IPA4wpp6YoLT1aQhLp+jBjcTTh/Sv9QD1NrYx23Lpie1ET 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:298874 Archived-At: Michael Albinus 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 consiste= nt >>> 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 w= hy >> *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 direc= tions. > >>> 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.