From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#74352: 29.4; emerge-files with tramp + local file fails Date: Thu, 14 Nov 2024 09:05:16 +0200 Message-ID: <86frnul2hf.fsf@gnu.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13853"; mail-complaints-to="usenet@ciao.gmane.io" 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 Thu Nov 14 08:06:21 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 1tBTvp-0003Ot-HK for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 14 Nov 2024 08:06:21 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBTvY-0003MN-5l; Thu, 14 Nov 2024 02:06: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 1tBTvW-0003M9-Fy for bug-gnu-emacs@gnu.org; Thu, 14 Nov 2024 02:06:02 -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 1tBTvW-0000yE-6L for bug-gnu-emacs@gnu.org; Thu, 14 Nov 2024 02:06: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:References:In-Reply-To:From:Date:To:Subject; bh=SwZLQURXqvGuXTCRHBnl3XaUsLtO1JzykEIGY1EBqW0=; b=H6+VUms8pLNm+/uzJIz8FGv91LKStLZWwiXVSv8gXd9dW6C19NlUKo/SUUCOw7zBWCFKnxjWWI24s7M+oB/LG5E4g77pno/SoFf0HoPECjIOl0YB5htYDftCydB+VcQ57p40DuhQg4kHmSpsOq7VN2wahDuOe3csaT2KfFQXqKTHbPxIlntIbKVI6E1U7o3s3vpB/mtSKD4eHk37l0FGfltrYp6WLK4DlyemF9hrPZrkCfWiZlkMXzbped3Xen6R7ccrzeZcyW2dWEEE4VaQk2f3LqPmnu+pmJyAcFFFgB0B1Ox5h4kWl44ioezqdhjv2D7916hCc5GalHaMpXzBhg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tBTvV-0005Qu-Jf for bug-gnu-emacs@gnu.org; Thu, 14 Nov 2024 02:06:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 14 Nov 2024 07:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74352 X-GNU-PR-Package: emacs Original-Received: via spool by 74352-submit@debbugs.gnu.org id=B74352.173156792920838 (code B ref 74352); Thu, 14 Nov 2024 07:06:01 +0000 Original-Received: (at 74352) by debbugs.gnu.org; 14 Nov 2024 07:05:29 +0000 Original-Received: from localhost ([127.0.0.1]:44718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBTuy-0005Q2-Hh for submit@debbugs.gnu.org; Thu, 14 Nov 2024 02:05:28 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:53076) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tBTuw-0005Po-11 for 74352@debbugs.gnu.org; Thu, 14 Nov 2024 02:05:27 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tBTuq-0000PE-73; Thu, 14 Nov 2024 02:05:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=SwZLQURXqvGuXTCRHBnl3XaUsLtO1JzykEIGY1EBqW0=; b=jj1WTSJbPk1J/vRjDXCW 6laC+Dle2ibRwGMltPrd0II57JuCc3PdbFFf4ugpcaeUtkgueSBm2x8AftRePKlR15s9mTV+jALmS RK8+tJusWDunj8Tu04PIzurFsCGRSmSG06kMpnVyatj5Spwd6IIPXH9gWmNDHN4vGhouf0UaKZJyG tAciqwvj18aGj7sIH1havuvFWNjaQWzeQxBz1w1PsFFUOuiC2OWAOXMo/BNNIpOS8dgv4O1puAwz8 M546hy8WdsqvwjMH4jdQ796/cFCKL7NMWi1kOH9uVSo09onWMepmLUJBFhYNVQ5KF/EQ4x7W6WmIR FvqQf29R6IeVdw==; In-Reply-To: (message from =?UTF-8?Q?J=C3=B6rg?= Sommer on Wed, 13 Nov 2024 20:11:10 +0100) 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:295305 Archived-At: > Date: Wed, 13 Nov 2024 20:11:10 +0100 > From: Jörg Sommer > > when running `emerge-files` with `/ssh:remote:file` and `~/local-file` I get > the buffer `*emerge-diff-errors*` with: > > ``` > diff: /tmp/tramp.wlcRNL: No such file or directory > diff: /home/joerg/local-file: No such file or directory > ``` > > This change solves the problem: > > ```diff > diff --git lisp/vc/emerge.el lisp/vc/emerge.el > index ca48f2f3c7b..562041e4232 100644 > --- lisp/vc/emerge.el > +++ lisp/vc/emerge.el > @@ -581,6 +581,7 @@ emerge-make-diff-list > (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*")) > (with-current-buffer > emerge-diff-buffer > + (setq default-directory (file-name-directory file-A)) Thanks, but why file-A? Isn't the problem symmetric wrt the two files? Or what am I missing?