From unknown Sun Aug 10 16:51:43 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#78925 <78925@debbugs.gnu.org> To: bug#78925 <78925@debbugs.gnu.org> Subject: Status: 31.0.50; ffap's filename prompt problem in remote files Reply-To: bug#78925 <78925@debbugs.gnu.org> Date: Sun, 10 Aug 2025 23:51:43 +0000 retitle 78925 31.0.50; ffap's filename prompt problem in remote files reassign 78925 emacs submitter 78925 Liu Hui severity 78925 normal thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 30 05:55:00 2025 Received: (at submit) by debbugs.gnu.org; 30 Jun 2025 09:55:01 +0000 Received: from localhost ([127.0.0.1]:40193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uWBE4-00015A-2r for submit@debbugs.gnu.org; Mon, 30 Jun 2025 05:55:00 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38902) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uWBDz-00013v-Sv for submit@debbugs.gnu.org; Mon, 30 Jun 2025 05:54:56 -0400 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 1uWBDt-0008Ej-4r for bug-gnu-emacs@gnu.org; Mon, 30 Jun 2025 05:54:49 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uWBDr-0006S6-1e for bug-gnu-emacs@gnu.org; Mon, 30 Jun 2025 05:54:48 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a531fcaa05so1003868f8f.3 for ; Mon, 30 Jun 2025 02:54:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751277283; x=1751882083; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=m7LG3O5h5N7MXfePydPQyxSvZLfr3Mh1xTIdAh7h8k0=; b=b+Kyy1i7IMIv05Ep9tcxXZjTW9Rkqwvx2sesxLroV0T6Yz0DiY3qwt96Mm01aI/cpH qab5yIALSLOlJD5KLcnt5X2EcA/5h26GkMNFCRQCKLpXxW/gJ55ZQ8C68vY7fP0/D2ss 7odT2Po1karUM94BqGt1yBfq/RJjxBQnH1aKSOXWdLmvtxGprJwC5X0aRNSypJgypVgv qQEPVD7t11q7PRO3/x616+lWKEEA1nUI9utSDmmoLrxlxHi76djeN382gPt+aYND6bsE 5Z7Vo/jLv0PyIa/l6kj+PAhAXF0FFdJsTeE0+UPNf+FW8UNKpErh4cUfjof33stvU036 v39Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751277283; x=1751882083; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=m7LG3O5h5N7MXfePydPQyxSvZLfr3Mh1xTIdAh7h8k0=; b=QEdcd0fL9VHiDNY8cuN3lOG8hnBuXPllAwGcr98vM2IGqZLAVVv2JUaKA/lAknUVE3 KQId4ha8KWiPAjJDjFpZ+avNPpUOgkN1xpp0XzVP0hGdAzNd5Wl7Qug87BS73sjkls2P +B8/Bo18KH3bhDyeAayiZbd/EJk84Nrg2NhamHoJCyBJrQG+cGjo07FZUafafRN9uiEs oKwLtf8YT7V2ywMGzwZhAEf8OXY41kdBfesSOnKRFfYay8ga6AlgEvbnVRvwYiVDTHRu rCBDkYbimgVbtqOrkoumxRyHZwRQYbibKXBIkyhHvaWwK9xni70BprZmzPh5bnRMQyVx a0Jg== X-Gm-Message-State: AOJu0Yy3n9w2Qe09iStXyrpwSz9RJqoJG9VKjMRI5uHtZoi2bKtL65uZ Up5flcwsqxptC06e+iqa5DrDkEsahNOSJnNy0LFquQpCaaPWdo9dSMaZa1KTIaMPPICcDEoBIM8 w7ZyqD401XY/1/TgPMAbl2hIqk6x519jBw4V8 X-Gm-Gg: ASbGncsaZjuiGFEvSMH3h3ZaC3nGYbj+6y6Y7MTXoyZMEkN3w2JYWNPOYjaPVDxkCEY abqSBOq63sJ4MfyJcTunqTYb24+wUSff2XY13jS0eWFhA3Zwz6mV74IrjpJm8fOnQ0m7Uzeb2vV T1Tc93sO7QCOk5IBZls6xKigEk8o5tkb816PRDD9mzZcFo19b+hRv9kg== X-Google-Smtp-Source: AGHT+IGeqhssN63gjAB+rlQzWtwkE6XPWUJJ9bP7KYCycfG26hbxo/8EbOEnBcTHRLr5HnkM1ow9SiN/wRSSRKM2ido= X-Received: by 2002:a05:6000:25e2:b0:3a5:88e9:a54f with SMTP id ffacd0b85a97d-3a8f435ed20mr9020590f8f.1.1751277282907; Mon, 30 Jun 2025 02:54:42 -0700 (PDT) MIME-Version: 1.0 From: Liu Hui Date: Mon, 30 Jun 2025 17:54:31 +0800 X-Gm-Features: Ac12FXyTTQYjyQnRtp5H8mbY9z56-CgNcb6AwKWuypMbywwvx2TzURaiXJh2KtM Message-ID: Subject: 31.0.50; ffap's filename prompt problem in remote files To: bug-gnu-emacs@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=liuhui1610@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, When using ffap in remote files, I find the guess of filename at point in the prompt, which is mainly determined by ffap-file-at-point, is not suitable or at least inconsistent. Case 1: Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (liuhui1610[at]gmail.com) 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liuhui1610[at]gmail.com) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) Hi, When using ffap in remote files, I find the guess of filename at point in the prompt, which is mainly determined by ffap-file-at-point, is not suitable or at least inconsistent. Case 1: 1. emacs -Q 2. Open a remote file: C-x C-f /ssh:server:~/test_file 3. type a filename that exists in localhost (e.g. /etc/hosts), and M-x ffap ffap finds the local file /etc/hosts instead of the remote one. The reason is that ffap-file-at-point always checks the local file first. ffap-file-at-point only tries to find remote file if there is no existing local file. However, it is more reasonable to first check (or only check) remote file and always prompt remote filename (i.e. /ssh:server:/etc/hosts) in remote cases. Case 2: 1. emacs -Q 2. Open a file in a remote project: C-x C-f /ssh:server:~/a_git_project/test_file 3. Create a file that exists outside the project in the remote host, e.g. M-! touch /tmp/abc 4. type the above filename (i.e. /tmp/abc), in test_file, and M-x ffap ffap prompts /ssh:server:~/a_git_project/tmp/abc, while in Emacs 29 prompts /ssh:server:/tmp/abc correctly. This problem seems to be related to commit 1eae0e7edf4. Thanks. -- Liu Hui From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 30 08:58:26 2025 Received: (at 78925) by debbugs.gnu.org; 30 Jun 2025 12:58:26 +0000 Received: from localhost ([127.0.0.1]:42562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uWE5Z-0002XU-NR for submit@debbugs.gnu.org; Mon, 30 Jun 2025 08:58:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38806) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uWE5T-0002W3-VU for 78925@debbugs.gnu.org; Mon, 30 Jun 2025 08:58:22 -0400 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 1uWE5O-0001sS-Az; Mon, 30 Jun 2025 08:58:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=eDah3K6qo4gVT0hYItoo2lge6zEocQA09U8alzBujaU=; b=CyIl48nRB62x b6FAuwX94L+pX2vKSHg41dujiAMjZvAsCiYO65s6ovrVx7HDRsrYNxHGyJGIUoiK6o4SDTbvSZcP8 VgzSU2IKCeGCI85KKIIWYTZoGiAdhhKSah/WIVtNn4KZquDSsY+Y1XY+7yEGVPdRDHhhFwmATOWFz a15Qc5Ac/eISBy/Z856diQReOn8ZyQPwMoe/R1TUxKdaRVfvg7+PnyvipRAte/8ZRdbWJPs1Lm1vB /0OfIYXoSsi5OryMLNmnn9afAUSeY8VwlCzXVwR0YjFCsgPVGPciwuibPSn73qoDY7t8BO02NvQgN /l8UpEFeX6RzEMivc1zUJw==; Date: Mon, 30 Jun 2025 15:58:11 +0300 Message-Id: <86ecv14c9o.fsf@gnu.org> From: Eli Zaretskii To: Liu Hui In-Reply-To: (message from Liu Hui on Mon, 30 Jun 2025 17:54:31 +0800) Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files References: X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78925 Cc: 78925@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Liu Hui > Date: Mon, 30 Jun 2025 17:54:31 +0800 > > When using ffap in remote files, I find the guess of filename at point > in the prompt, which is mainly determined by ffap-file-at-point, is > not suitable or at least inconsistent. > > Case 1: > > 1. emacs -Q > 2. Open a remote file: > C-x C-f /ssh:server:~/test_file > 3. type a filename that exists in localhost (e.g. /etc/hosts), and M-x ffap > > ffap finds the local file /etc/hosts instead of the remote one. The > reason is that ffap-file-at-point always checks the local file first. > ffap-file-at-point only tries to find remote file if there is no > existing local file. > > However, it is more reasonable to first check (or only check) remote > file and always prompt remote filename (i.e. /ssh:server:/etc/hosts) > in remote cases. I don't think I agree. However, perhaps a user option or a prefix argument could be used to control which behavior is preferred. > Case 2: > > 1. emacs -Q > 2. Open a file in a remote project: > C-x C-f /ssh:server:~/a_git_project/test_file > 3. Create a file that exists outside the project in the remote host, e.g. > M-! touch /tmp/abc > 4. type the above filename (i.e. /tmp/abc), in test_file, and M-x ffap > > ffap prompts /ssh:server:~/a_git_project/tmp/abc, while in Emacs 29 > prompts /ssh:server:/tmp/abc correctly. This problem seems to be > related to commit 1eae0e7edf4. This is a separate issue, please submit a separate bug report for it. From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 30 11:48:20 2025 Received: (at 78925) by debbugs.gnu.org; 30 Jun 2025 15:48:20 +0000 Received: from localhost ([127.0.0.1]:45823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uWGjz-00083p-FD for submit@debbugs.gnu.org; Mon, 30 Jun 2025 11:48:19 -0400 Received: from mout.gmx.net ([212.227.15.18]:39703) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uWGjs-00082P-FB for 78925@debbugs.gnu.org; Mon, 30 Jun 2025 11:48:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1751298485; x=1751903285; i=michael.albinus@gmx.de; bh=EAtxSUnilVEiBS5uOrAw/8uP8F0B3t8szV7yO4uygXM=; 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=eibVfLg/bFx3i5MQoLiTxcxVM+D8oNANpVy2K79H4SXbcWwRz+zIUFEJWVYDbFLK rTIQBQjJ8H82w9NEwxLTUw+00mbGwCXPuW8tWXVUTRMB69uN5y/HCUnUDRmPU1bo8 1KhziAv3O6V9syz66YeKOpPga/00PSVWDLxbSs6MRoVWZtx8Znikqi0KLV+d0M7+9 eFmZBHfCinp6UsWwICzIE6aArCa5h3x/WfFjGHnfibIRYmfNbQc+CjOFMfloWs25t amZ1OsoO5AZi1CVlkrFfKFlzcvNfGGPvZjhX61kwUGMQspZ82Y0DXMe5+Hd54PXiR vxlJs4MBUCd5eeSXFg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from gandalf.gmx.de ([185.89.37.61]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MplXz-1v4Soi25e9-00oXGg; Mon, 30 Jun 2025 17:48:05 +0200 From: Michael Albinus To: Eli Zaretskii Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files In-Reply-To: <86ecv14c9o.fsf@gnu.org> References: <86ecv14c9o.fsf@gnu.org> Date: Mon, 30 Jun 2025 17:48:04 +0200 Message-ID: <87h5zxxmbv.fsf@gmx.de> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:lyVwRdyUmWereFwIt4FLu4vOGSX5SxSVnkHN6ac9WjBBxDUkNTX A+6W3snYMqJ2pjVs+vVOOlq9oVi9lF9+7OpwBtfpFEhIRcfyEGaliuQTBfdgq7YOPfmjnel gXbdidQ483hp1RUvYYilyYP8oCcB1D9NzNSjj9VUiWuHsP1SI8zbht7d2GFD5ZsQWdcB1zF 9z4VZc3peh43CBseyftUg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:GYVQtOSeqXY=;qrKIJGxDYrJYevtJhvHLZE8xAXh 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 QVe+oeB3+18b2p7BrDx9A+qA82RutHrQ= Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 78925 Cc: Liu Hui , 78925@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.5 (-) Eli Zaretskii writes: Hi, >> When using ffap in remote files, I find the guess of filename at point >> in the prompt, which is mainly determined by ffap-file-at-point, is >> not suitable or at least inconsistent. >>=20 >> Case 1: >>=20 >> 1. emacs -Q >> 2. Open a remote file: >> C-x C-f /ssh:server:~/test_file >> 3. type a filename that exists in localhost (e.g. /etc/hosts), and M-x = ffap >>=20 >> ffap finds the local file /etc/hosts instead of the remote one. The >> reason is that ffap-file-at-point always checks the local file first. >> ffap-file-at-point only tries to find remote file if there is no >> existing local file. >>=20 >> However, it is more reasonable to first check (or only check) remote >> file and always prompt remote filename (i.e. /ssh:server:/etc/hosts) >> in remote cases. > > I don't think I agree. However, perhaps a user option or a prefix > argument could be used to control which behavior is preferred. FTR, /etc/hosts is an absolute file name; ffap is right showing the local file. And changing the default to always prepend the remote prefix isn't right: there might be use cases, that you have a reference to a local file /etc/hosts in your buffer, the buffer has a remote default directory, and you still want to see the local file. It depends on the context. A user option might help, but it is all-or-nothing. Either, you will always see the remote file, or always the local file. Your expectation might change, case by case. Another possibility would be a command prefix. If ffap is called with the universal-argument non-nil (C-u invoked), a local file like /etc/hosts might be displayed from the remote host. Or vice-versa, whatever we declare as default. Best regards, Michael. From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 01 00:45:31 2025 Received: (at 78925) by debbugs.gnu.org; 1 Jul 2025 04:45:31 +0000 Received: from localhost ([127.0.0.1]:52883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uWSs6-0002lx-2H for submit@debbugs.gnu.org; Tue, 01 Jul 2025 00:45:30 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:59774) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uWSs1-0002jp-Ah for 78925@debbugs.gnu.org; Tue, 01 Jul 2025 00:45:27 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3a51481a598so1556926f8f.3 for <78925@debbugs.gnu.org>; Mon, 30 Jun 2025 21:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751345119; x=1751949919; darn=debbugs.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=wsmcHSIW5xvjllkbCTxoRePz6RbqyxB2POmIP9mZENE=; b=HH+6Z3eb6G/Lp2blYIeKgynN9F2tgxkRtZDfA3fZJmdPpe6LOrd78ETzzhsPJSUR/o 6jNdYI4OOcmP4xvQnSI65WBcrG4RZ0pEsVjh7UPjtzPnAeUm5CWQks81KCTk6we4Cdeu EqAz1xpBjwcrZIKU1tLFiLAKIsARzuu2sWO49XcYzF3t4V20j6Z1Aniem0aAc+sWlOEY c7L4yZgOB7v6lwaxUYDmN4E1Q6V0nm629lR7rYc0euq0qvmhNwuHT2NfGxPZO2u/ia6j gyjd4GudLMPn3so4w/AGOcOnkZ7goeWVUtngmkIovJgeSqO12rcjHe5dZ6nflzg8PHfG wJFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751345119; x=1751949919; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wsmcHSIW5xvjllkbCTxoRePz6RbqyxB2POmIP9mZENE=; b=PHlv4aBclH0imVE+w4IzQQJ1JSrCwp9Zmge3WfGHTAu79+2civ/xa5+nmuUh01z9bc Oi+ZlFCeHbqh8CyD6lpJSageICZ/WZHtHuv83ua5LnZWgfVIjFjP4zCzVdYwdSGWuiZi TH+nFL8v82hGZ6HnSCWMGqxh4iqWzzEyKjASEOMrbvKRqRQl8VK3I5PyjWq8f96qQIGy TSB9o7AQ5XanTUkjVT70ni0mohjtp9wpdI2l9Y7XYUBwhfR62XUpWgwHQ0r471olIobO dj0yekd+sl5q/4cHROMspD6Ws0ebL4voVBSXxxECW8nt6/tEGCMgzYygHa/ptXzcXvZA hJCA== X-Forwarded-Encrypted: i=1; AJvYcCWxDSiefTbfpxzZOylySTtg6DrMl8L9/COk4l+gkI1C/IYhdDph26cz2F9ZoRPLv9EkbrIsUg==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yym8BtTbuSJzMVnqUmB9HDmdYPOD3lPGO6F5xP5j88LvW9iLYhb 8HDCvQEY7hlI+lyr6o2YnxBNskX2qiGtD9SI8CM0cSa4tN3f1MGLyyFLY/nR9UlX6P11YXXCmVS 4KThb0sYoqhrof2wImw4gA13W1Y+eeSc= X-Gm-Gg: ASbGncui2DopkYzIRu6JesxJF5eICIBYWi8BuYAylQCROFMeAa1PXOtu63IZtMj//xB +WmQYMiGELcNmhI14sruZY3W6PvxNA4NN8meCt2UAAHvwjzbmKrbS7fq7SgTaXuhkqSkOac+4I+ bFLWOU7kaYMy1IBSOPCmsA+kM7u4AQPpI1nEOcu4Yya3WYEEF8ssqyaQ== X-Google-Smtp-Source: AGHT+IEvy/TWERUDX6YCoQSgBjO3BjIHW27YXkF8xjCAWnyk4TkCtdd8P6dZ5OjXzX40ImcYgfSaygIAqmLAC7bqi1I= X-Received: by 2002:a05:6000:4013:b0:3aa:ab93:c7de with SMTP id ffacd0b85a97d-3aaab93c993mr9622956f8f.34.1751345118680; Mon, 30 Jun 2025 21:45:18 -0700 (PDT) MIME-Version: 1.0 References: <86ecv14c9o.fsf@gnu.org> <87h5zxxmbv.fsf@gmx.de> In-Reply-To: <87h5zxxmbv.fsf@gmx.de> From: Liu Hui Date: Tue, 1 Jul 2025 12:45:07 +0800 X-Gm-Features: Ac12FXzhmBE9FBVdlZCBcyMwZNxSEY9T_gG6cTcAu87aJfrMutj_Y7uW387giGo Message-ID: Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files To: Michael Albinus Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 78925 Cc: Eli Zaretskii , 78925@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Mon, Jun 30, 2025 at 11:48=E2=80=AFPM Michael Albinus wrote: > > Eli Zaretskii writes: > > Hi, > > >> When using ffap in remote files, I find the guess of filename at point > >> in the prompt, which is mainly determined by ffap-file-at-point, is > >> not suitable or at least inconsistent. > >> > >> Case 1: > >> > >> 1. emacs -Q > >> 2. Open a remote file: > >> C-x C-f /ssh:server:~/test_file > >> 3. type a filename that exists in localhost (e.g. /etc/hosts), and M-x= ffap > >> > >> ffap finds the local file /etc/hosts instead of the remote one. The > >> reason is that ffap-file-at-point always checks the local file first. > >> ffap-file-at-point only tries to find remote file if there is no > >> existing local file. > >> > >> However, it is more reasonable to first check (or only check) remote > >> file and always prompt remote filename (i.e. /ssh:server:/etc/hosts) > >> in remote cases. > > > > I don't think I agree. However, perhaps a user option or a prefix > > argument could be used to control which behavior is preferred. Thanks for your comments. > FTR, /etc/hosts is an absolute file name; ffap is right showing the > local file. And changing the default to always prepend the remote prefix > isn't right: there might be use cases, that you have a reference to a > local file /etc/hosts in your buffer, the buffer has a remote default > directory, and you still want to see the local file. It depends on the > context. I'm not saying ffap is wrong, after all, it's just guessing. The key is that we should use the more likely option as the default, while also providing options for other contexts. When the buffer's default directory and buffer-file-name are both remote, without other prior information, I think the filenames in the buffer are much more likely to be remote files than local ones. If the user wants to access the corresponding local file, removing the preceding remote host part manually is quite easy. > A user option might help, but it is all-or-nothing. Either, you will > always see the remote file, or always the local file. Your expectation > might change, case by case. A user option is useful for file-name-at-point-functions (C-x C-f M-n), embark-target-file-at-point etc, which cannot use prefix argument. How about 'ffap-remote-context-preference'? Depending on whether the file exists on remote and local hosts, current ffap behavior and possible options are as follows. IMO, perfer-remote or perfer-remote-exist is more suitable to be the default behavior. | file | prefer-local-exist | prefer-remote | prefer-remote-exist | | exist? | (current behavior) | | | |--------+--------------------+---------------+---------------------| | both | local | remote | remote | | remote | remote | remote | remote | | local | local | remote parent | local | | none | local parent | remote parent | remote parent | > Another possibility would be a command prefix. If ffap is called with > the universal-argument non-nil (C-u invoked), a local file like > /etc/hosts might be displayed from the remote host. Or vice-versa, > whatever we declare as default. From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 07 05:58:43 2025 Received: (at 78925) by debbugs.gnu.org; 7 Jul 2025 09:58:43 +0000 Received: from localhost ([127.0.0.1]:33053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYicS-0005Az-9y for submit@debbugs.gnu.org; Mon, 07 Jul 2025 05:58:42 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:59655) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uYicO-0005A4-Ma for 78925@debbugs.gnu.org; Mon, 07 Jul 2025 05:58:37 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-450ce671a08so14146245e9.3 for <78925@debbugs.gnu.org>; Mon, 07 Jul 2025 02:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751882310; x=1752487110; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=iD+QTeJ+X3Jr9n7b+RGgpnBIdbnSvfdiTk/DrY2lYl0=; b=cMZVOHLXjifYnOASb9TeBayqUOdiMav5OCotCbLKN9iqSRLfZIHuxu4bj7LG19XFl7 J4eki0CvjXiUiSz1Tqd2jS6eWGHGwTPwwQKD/Jo53jfLIGyuadIXSTihsK+dK/wcvdy/ nPwvIXdgD9IoNy0MfXcMj4Q1ZMmiYhOi8/QldDHF8qB3GNA0KtN11ntTHI/U77LNiXdx KCXYdncOpmTAcJWGRZ59HpEvb9hLsa4tElvAp1ayzc2gYOpmNdSK0ojAdVgTIHUCHOjs cCbrzAl/Pe5PbsT+F/g7K1ofgEbmJmauHgOcLrdz0NPFxLQA9okzQ8JDr55n+pDYvcSY yzgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751882310; x=1752487110; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iD+QTeJ+X3Jr9n7b+RGgpnBIdbnSvfdiTk/DrY2lYl0=; b=Sg+LoV/YdXU4gaB7QEw5yiU0CMFJsxyzQ1FK6Jk1UvlOmtxzCW4bjqqnRfIKNd5+nI z29FYUr4qZMtEnDq/A4UVXPWtxCcxEtsRm31xTxDJyMWfiEIzPiX0coGcjPFqWR5kGNO dD6VsivK5/isTMB9+q3ZzhhWP3fBSVR3MaHm1a2fuVYCL7tSV5Ny5vtAGj76uvv/KbK/ HEGcXnbJiWv/e7bnQ9U95U2nLftn2zcQtun9ZVBkncmereW8gVTfOx6qwIznP9vhw+7/ IQ9giXwd1RwEwujfEqxEPzMGX7jchKEt04ZbFQB1BazaHRYpqHX6zv53BEmLlZd7Odfj rfVg== X-Gm-Message-State: AOJu0YyU7XC97ozotOc4EniZ8RE5GAq1bsWeRfLu91ENl9Gdaw57xXdk /re1KxS9b/TDJXyQbR8BwY8xaCgBXII+/+z1/RgeS8kFzfE/kJ/2OVzMrH5CdneSekQVGUHmL97 F2vMxhJC+6GmDyDr15wYgtxkczXppGAk= X-Gm-Gg: ASbGncvi/MY2S7j3AmtFxkf89keIhbiKnHXAtV3Zt+72xGd4mj8t7TXCtzWvqxkYDp5 KudeHN6x6Tz9l57W1otU6F1wrqZ96lHJAuEAV9TAzIiFaeKsizZOQrAQgSevd9yi6kMRj9Gh1jO 3RiKNgj4cBSZZLjunpWfvVR2et++z6qDGLJscRGxQYGvI= X-Google-Smtp-Source: AGHT+IFl8i6wKNS48N/6X13Tu4Hp53JmFOtO/Z4DOBu+TqwfjcxlVzsTXDhGqMbhYzm7SyXlO8eVsEwB0ijNPO1mmzg= X-Received: by 2002:a05:600c:8885:b0:450:d5bf:6720 with SMTP id 5b1f17b1804b1-454b5e9a2ffmr86654425e9.3.1751882310054; Mon, 07 Jul 2025 02:58:30 -0700 (PDT) MIME-Version: 1.0 References: <86ecv14c9o.fsf@gnu.org> In-Reply-To: <86ecv14c9o.fsf@gnu.org> From: Liu Hui Date: Mon, 7 Jul 2025 17:58:17 +0800 X-Gm-Features: Ac12FXztggsaICMKfDr0m2dZAaxzaq6eM6NTbtXsna47C8cH9r6h9HAm2u-g-ho Message-ID: Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files To: Eli Zaretskii Content-Type: multipart/mixed; boundary="000000000000c789be063953e213" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 78925 Cc: 78925@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --000000000000c789be063953e213 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Jun 30, 2025 at 8:58=E2=80=AFPM Eli Zaretskii wrote: > > > From: Liu Hui > > Date: Mon, 30 Jun 2025 17:54:31 +0800 > > > > When using ffap in remote files, I find the guess of filename at point > > in the prompt, which is mainly determined by ffap-file-at-point, is > > not suitable or at least inconsistent. > > > > Case 1: > > > > 1. emacs -Q > > 2. Open a remote file: > > C-x C-f /ssh:server:~/test_file > > 3. type a filename that exists in localhost (e.g. /etc/hosts), and M-x = ffap > > > > ffap finds the local file /etc/hosts instead of the remote one. The > > reason is that ffap-file-at-point always checks the local file first. > > ffap-file-at-point only tries to find remote file if there is no > > existing local file. > > > > However, it is more reasonable to first check (or only check) remote > > file and always prompt remote filename (i.e. /ssh:server:/etc/hosts) > > in remote cases. > > I don't think I agree. However, perhaps a user option or a prefix > argument could be used to control which behavior is preferred. The attached patch adds an option 'ffap-prefer-remote-file', which defaults to nil. A non-nil value means ffap always finds remote files for absolute filenames in remote case, instead of finding local files first. --000000000000c789be063953e213 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Add-option-ffap-prefer-remote-file-bug-78925.patch" Content-Disposition: attachment; filename="0001-Add-option-ffap-prefer-remote-file-bug-78925.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_mcsxf6o90 RnJvbSA3NjUwZGMxYjM3OTg3ZjRmMzMxZWJhOTE2N2I3OTQ1OWZjMWQ2MjhlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog TW9uLCA3IEp1bCAyMDI1IDE3OjQ1OjE4ICswODAwClN1YmplY3Q6IFtQQVRDSF0gQWRkIG9wdGlv biAnZmZhcC1wcmVmZXItcmVtb3RlLWZpbGUnIChidWcjNzg5MjUpCgpUaGlzIG9wdGlvbiBvbmx5 IGFmZmVjdHMgYWJzb2x1dGUgZmlsZW5hbWVzIHRoYXQgYXJlIGZvdW5kIGJ5CmZmYXAtZmlsZS1h dC1wb2ludCBpbiBidWZmZXJzIHdpdGggcmVtb3RlIGRlZmF1bHQgZGlyZWN0b3J5LgoKVGhlIGhh bmRsaW5nIG9mIHJlbGF0aXZlIGZpbGVuYW1lcyBpbiBhYm92ZSBidWZmZXJzIHJlbWFpbnMKdW5j aGFuZ2VkOiBmZmFwLWZpbGUtYXQtcG9pbnQgcmV0dXJucyB0aGUgcmVsYXRpdmUgZmlsZW5hbWUs CndoaWNoIGNhbiBiZSBjb252ZXJ0ZWQgdG8gYSByZW1vdGUgYWJzb2x1dGUgZmlsZW5hbWUgYnkK c3Vic2VxdWVudCBjYWxsZXJzIChlLmcuIGZmYXApIHVzaW5nIGV4cGFuZC1maWxlLW5hbWUuCgoq IGxpc3AvZmZhcC5lbCAoZmZhcC1wcmVmZXItcmVtb3RlLWZpbGUpOiBOZXcgdXNlciBvcHRpb24u CihmZmFwLWZpbGUtZXhpc3RzLXN0cmluZyk6IEFkZCBhbiBvcHRpb25hbCBhcmd1bWVudCB0byBh bGxvdyB0aGUKY2hlY2sgb2YgZXhpc3RlbmNlIG9mIGFic29sdXRlIGZpbGVuYW1lIG9uIHRoZSBy ZW1vdGUgaG9zdC4KKGZmYXAtZmlsZS1hdC1wb2ludCk6IEFsd2F5cyBmaW5kIHJlbW90ZSBmaWxl cyBpbiByZW1vdGUgY29udGV4dAppZiB0aGUgbmV3IG9wdGlvbiBpcyBub24tbmlsLgoqIHRlc3Qv bGlzcC9mZmFwLXRlc3RzLmVsIChmZmFwLXRlc3QtcmVtb3RlKTogQWRkIGEgdGVzdC4KKiBldGMv TkVXUzogQW5ub3VuY2UgdGhlIGNoYW5nZS4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgICB8 ICA2ICsrKysKIGxpc3AvZmZhcC5lbCAgICAgICAgICAgIHwgNzQgKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0KIHRlc3QvbGlzcC9mZmFwLXRlc3RzLmVsIHwgMjIgKysr KysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDc3IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggNDM0NzdkNDM4YzMu LjY3NTBhZjA2N2M1IDEwMDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtMjIx NSw2ICsyMjE1LDEyIEBAIHdoaWNoIGFscmVhZHkgdGFrZXMgdGhpcyBhcmd1bWVudCBmb3IgYSBz aW5nbGUgYXR0cmlidXRlLiAgVGhpcyBpcwogdXNlZnVsIHdoZW4geW91IHdhbnQgdGhlIGZhY2Ug YXR0cmlidXRlcyB0byBiZSBhYnNvbHV0ZSBhbmQgbm90CiAndW5zcGVjaWZpZWQnLgogCistLS0K KyoqKiBOZXcgdXNlciBvcHRpb24gJ2ZmYXAtcHJlZmVyLXJlbW90ZS1maWxlJy4KK0lmIG5vbi1u aWwsIGZmYXAgYWx3YXlzIGZpbmRzIHJlbW90ZSBmaWxlcyBpbiBidWZmZXJzIHdpdGggcmVtb3Rl CisnZGVmYXVsdC1kaXJlY3RvcnknLiAgSWYgbmlsLCBmZmFwIGZpbmRzIGxvY2FsIGZpbGVzIGZp cnN0IGZvciBhYnNvbHV0ZQorZmlsZW5hbWVzIGluIGFib3ZlIGJ1ZmZlcnMuICBUaGUgZGVmYXVs dCBpcyBuaWwuCisKIC0tLQogKiogRmx5bWFrZQogCmRpZmYgLS1naXQgYS9saXNwL2ZmYXAuZWwg Yi9saXNwL2ZmYXAuZWwKaW5kZXggMTBhZmNkOTUxNGEuLjY0YzJjNzgwNjcyIDEwMDY0NAotLS0g YS9saXNwL2ZmYXAuZWwKKysrIGIvbGlzcC9mZmFwLmVsCkBAIC0xOTksNiArMTk5LDE2IEBAIGZm YXAtZm9vLWF0LWJhci1wcmVmaXgKIAkJICkKICAgOmdyb3VwICdmZmFwKQogCisoZGVmY3VzdG9t IGZmYXAtcHJlZmVyLXJlbW90ZS1maWxlIG5pbAorICAiV2hldGhlciB0byBwcmVmZXIgcmVtb3Rl IGZpbGVzIGluIHJlbW90ZSBjb250ZXh0LgorSWYgbm9uLW5pbCwgZmZhcCBhbHdheXMgZmluZHMg cmVtb3RlIGZpbGVzIGluIGJ1ZmZlcnMgd2l0aCByZW1vdGUKK2BkZWZhdWx0LWRpcmVjdG9yeScu ICBJZiBuaWwsIGZmYXAgZmluZHMgbG9jYWwgZmlsZXMgZmlyc3QgZm9yIGFic29sdXRlCitmaWxl bmFtZXMgaW4gYWJvdmUgYnVmZmVycy4gIFJlbGF0aXZlIGZpbGVuYW1lcyBhcmUgbm90IGFmZmVj dGVkIGJ5IHRoaXMKK29wdGlvbi4iCisgIDp0eXBlICdib29sZWFuCisgIDpncm91cCAnZmZhcAor ICA6dmVyc2lvbiAiMzEuMSIpCisKIChkZWZ2YXIgZmZhcC1tYXgtcmVnaW9uLWxlbmd0aCAxMDI0 CiAgICJNYXhpbXVtIGFjdGl2ZSByZWdpb24gbGVuZ3RoLgogV2hlbiB0aGUgcmVnaW9uIGlzIGFj dGl2ZSBhbmQgbGFyZ2VyIHRoYW4gdGhpcyB2YWx1ZSwKQEAgLTQ4OCw3ICs0OTgsNyBAQCBmZmFw LWZpbGUtc3VmZml4CiAoZGVmdmFyIGZmYXAtY29tcHJlc3Npb24tc3VmZml4ZXMgJygiLmd6IiAi LloiKQk7IC56IGlzIG1vc3RseSBkZWFkCiAgICJMaXN0IG9mIHN1ZmZpeGVzIHRyaWVkIGJ5IGBm ZmFwLWZpbGUtZXhpc3RzLXN0cmluZycuIikKIAotKGRlZnVuIGZmYXAtZmlsZS1leGlzdHMtc3Ry aW5nIChmaWxlICZvcHRpb25hbCBub21vZGlmeSkKKyhkZWZ1biBmZmFwLWZpbGUtZXhpc3RzLXN0 cmluZyAoZmlsZSAmb3B0aW9uYWwgbm9tb2RpZnkgcmVtb3RlLWhvc3QpCiAgIDs7IEVhcmx5IGpr YS1jb21wciB2ZXJzaW9ucyBtb2RpZmllZCBmaWxlLWV4aXN0cy1wIHRvIHJldHVybiB0aGUKICAg OzsgZmlsZW5hbWUsIG1heWJlIG1vZGlmaWVkIGJ5IGFkZGluZyBhIHN1ZmZpeCBsaWtlICIuZ3oi LiAgVGhhdAogICA7OyBicm9rZSB0aGUgaW50ZXJmYWNlIG9mIGZpbGUtZXhpc3RzLXAsIHNvIGl0 IHdhcyBsYXRlciBkcm9wcGVkLgpAQCAtNDk2LDIzICs1MDYsMzMgQEAgZmZhcC1maWxlLWV4aXN0 cy1zdHJpbmcKICAgIlJldHVybiBGSUxFIChtYXliZSBtb2RpZmllZCkgaWYgdGhlIGZpbGUgZXhp c3RzLCBlbHNlIG5pbC4KIFdoZW4gdXNpbmcgamthLWNvbXByIChhLmsuYS4gYGF1dG8tY29tcHJl c3Npb24tbW9kZScpLCB0aGUgcmV0dXJuZWQKIG5hbWUgbWF5IGhhdmUgYSBzdWZmaXggYWRkZWQg ZnJvbSBgZmZhcC1jb21wcmVzc2lvbi1zdWZmaXhlcycuCi1UaGUgb3B0aW9uYWwgTk9NT0RJRlkg YXJndW1lbnQgc3VwcHJlc3NlcyB0aGUgZXh0cmEgc2VhcmNoLiIKLSAgKGNvbmQKLSAgICgob3Ig KG5vdCBmaWxlKQkJCTsgcXVpZXRseSByZWplY3QgbmlsCi0JKHplcm9wIChsZW5ndGggZmlsZSkp KQkJOyBhbmQgYWxzbyAiIgotICAgIG5pbCkKLSAgICgoZmlsZS1leGlzdHMtcCBmaWxlKSBmaWxl KQkJOyB0cnkgdW5tb2RpZmllZCBmaXJzdAotICAgOzsgdGhyZWUgcmVhc29ucyB0byBzdXBwcmVz cyBzZWFyY2g6Ci0gICAobm9tb2RpZnkgbmlsKQotICAgKChub3QgKHJhc3NxICdqa2EtY29tcHIt aGFuZGxlciBmaWxlLW5hbWUtaGFuZGxlci1hbGlzdCkpIG5pbCkKLSAgICgobWVtYmVyIChmaWxl LW5hbWUtZXh0ZW5zaW9uIGZpbGUgdCkgZmZhcC1jb21wcmVzc2lvbi1zdWZmaXhlcykgbmlsKQot ICAgKHQJCQkJCTsgb2ssIGRvIHRoZSBzZWFyY2gKLSAgICAobGV0ICgobGlzdCBmZmFwLWNvbXBy ZXNzaW9uLXN1ZmZpeGVzKSB0cnkgcmV0KQotICAgICAgKHdoaWxlIGxpc3QKLQkoaWYgKGZpbGUt ZXhpc3RzLXAgKHNldHEgdHJ5IChjb25jYXQgZmlsZSAoY2FyIGxpc3QpKSkpCi0JICAgIChzZXRx IHJldCB0cnkgbGlzdCBuaWwpCi0JICAoc2V0cSBsaXN0IChjZHIgbGlzdCkpKSkKLSAgICAgIHJl dCkpKSkKK1RoZSBvcHRpb25hbCBOT01PRElGWSBhcmd1bWVudCBzdXBwcmVzc2VzIHRoZSBleHRy YSBzZWFyY2guCisKK1RoZSBvcHRpb25hbCBhcmd1bWVudCBSRU1PVEUtSE9TVCwgaWYgbm9uLW5p bCwgc2hvdWxkIGJlIGEgc3RyaW5nCityZXR1cm5lZCBieSBgZmlsZS1yZW1vdGUtcCcuICBJZiBp dCBpcyBub24tbmlsIGFuZCBGSUxFIGlzIGFic29sdXRlLAorY2hlY2sgd2hldGhlciBGSUxFIGV4 aXN0cyBvbiBSRU1PVEUtSE9TVC4gIFRoZSByZXR1cm5lZCBuYW1lIHVzZXMKK1JFTU9URS1IT1NU IGFzIHRoZSBwcmVmaXggaWYgdGhlIGZpbGUgZXhpc3RzLiIKKyAgKGxldCAoKG5vbi1lc3NlbnRp YWwgdCkpCisgICAgKGNvbmQKKyAgICAgKChvciAobm90IGZpbGUpCQkJOyBxdWlldGx5IHJlamVj dCBuaWwKKwkgICh6ZXJvcCAobGVuZ3RoIGZpbGUpKSkJOyBhbmQgYWxzbyAiIgorICAgICAgbmls KQorICAgICAoKGFuZCByZW1vdGUtaG9zdCAgICAgICAgICAgICAgICAgIDsgcHJlcGVuZCByZW1v dGUgaG9zdCB0byBmaWxlCisgICAgICAgICAgIChmaWxlLW5hbWUtYWJzb2x1dGUtcCBmaWxlKQor ICAgICAgICAgICAoc2V0cSBmaWxlIChjb25jYXQgcmVtb3RlLWhvc3QgZmlsZSkpCisgICAgICAg ICAgIG5pbCkpCisgICAgICgoZmlsZS1leGlzdHMtcCBmaWxlKSBmaWxlKQorICAgICA7OyB0aHJl ZSByZWFzb25zIHRvIHN1cHByZXNzIHNlYXJjaDoKKyAgICAgKG5vbW9kaWZ5IG5pbCkKKyAgICAg KChub3QgKHJhc3NxICdqa2EtY29tcHItaGFuZGxlciBmaWxlLW5hbWUtaGFuZGxlci1hbGlzdCkp IG5pbCkKKyAgICAgKChtZW1iZXIgKGZpbGUtbmFtZS1leHRlbnNpb24gZmlsZSB0KSBmZmFwLWNv bXByZXNzaW9uLXN1ZmZpeGVzKSBuaWwpCisgICAgICh0CQkJCQk7IG9rLCBkbyB0aGUgc2VhcmNo CisgICAgICAobGV0ICgobGlzdCBmZmFwLWNvbXByZXNzaW9uLXN1ZmZpeGVzKSB0cnkgcmV0KQor ICAgICAgICAod2hpbGUgbGlzdAorCSAgKGlmIChmaWxlLWV4aXN0cy1wIChzZXRxIHRyeSAoY29u Y2F0IGZpbGUgKGNhciBsaXN0KSkpKQorCSAgICAgIChzZXRxIHJldCB0cnkgbGlzdCBuaWwpCisJ ICAgIChzZXRxIGxpc3QgKGNkciBsaXN0KSkpKQorICAgICAgICByZXQpKSkpKQogCiAoZGVmdW4g ZmZhcC1maWxlLXJlbW90ZS1wIChmaWxlbmFtZSkKICAgIklmIEZJTEVOQU1FIGxvb2tzIHJlbW90 ZSwgcmV0dXJuIGl0IChtYXliZSBzbGlnaHRseSBpbXByb3ZlZCkuIgpAQCAtMTQ2NSw2ICsxNDg1 LDggQEAgZmZhcC1maWxlLWF0LXBvaW50CiAJICAgICAgc3RyaW5nKSkKIAkgKGFicyAoZmlsZS1u YW1lLWFic29sdXRlLXAgbmFtZSkpCiAJIChkZWZhdWx0LWRpcmVjdG9yeSBkZWZhdWx0LWRpcmVj dG9yeSkKKyAgICAgICAgIChyZW1vdGUtcCAoYW5kIGZmYXAtcHJlZmVyLXJlbW90ZS1maWxlCisg ICAgICAgICAgICAgICAgICAgICAgICAoZmlsZS1yZW1vdGUtcCBkZWZhdWx0LWRpcmVjdG9yeSkp KQogICAgICAgICAgKG9uYW1lIG5hbWUpKQogICAgICh1bndpbmQtcHJvdGVjdAogCShjb25kCkBA IC0xNDg0LDEwICsxNTA2LDExIEBAIGZmYXAtZmlsZS1hdC1wb2ludAogCSA7OyBBY2NlcHQgcmVt b3RlIG5hbWVzIHdpdGhvdXQgYWN0dWFsIGNoZWNraW5nICh0b28gc2xvdyk6CiAJICgoYW5kIGFi cyAoZmZhcC1maWxlLXJlbW90ZS1wIG5hbWUpKSkKIAkgOzsgT2ssIG5vdCByZW1vdGUsIHRyeSB0 aGUgZXhpc3RlbmNlIHRlc3QgZXZlbiBpZiBpdCBpcyBhYnNvbHV0ZToKLQkgKChhbmQgYWJzIChm ZmFwLWZpbGUtZXhpc3RzLXN0cmluZyBuYW1lKSkpCisJICgoYW5kIGFicyAoZmZhcC1maWxlLWV4 aXN0cy1zdHJpbmcgbmFtZSBuaWwgcmVtb3RlLXApKSkKIAkgOzsgVHJ5IHN0cmlwcGluZyBvZmYg bGluZSBudW1iZXJzLgogCSAoKGFuZCBhYnMgKHN0cmluZy1tYXRjaCAiOlswLTldIiBuYW1lKQot CSAgICAgICAoZmZhcC1maWxlLWV4aXN0cy1zdHJpbmcgKHN1YnN0cmluZyBuYW1lIDAgKG1hdGNo LWJlZ2lubmluZyAwKSkpKSkKKwkgICAgICAgKGZmYXAtZmlsZS1leGlzdHMtc3RyaW5nIChzdWJz dHJpbmcgbmFtZSAwIChtYXRjaC1iZWdpbm5pbmcgMCkpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbmlsIHJlbW90ZS1wKSkpCiAJIDs7IElmIGl0IGNvbnRhaW5zIGEg Y29sb24sIGdldCByaWQgb2YgaXQgKGFuZCByZXR1cm4gaWYgZXhpc3RzKQogCSAoKGFuZCAoc3Ry aW5nLW1hdGNoIHBhdGgtc2VwYXJhdG9yIG5hbWUpCiAJICAgICAgIChsZXQgKCh0aGlzLW5hbWUg KGZmYXAtc3RyaW5nLWF0LXBvaW50ICdub2NvbG9uKSkpCkBAIC0xNDk1LDcgKzE1MTgsNyBAQCBm ZmFwLWZpbGUtYXQtcG9pbnQKICAgICAgICAgICAgICAgICAgOzsgdGhlIGVtcHR5IHN0cmluZy4K IAkgICAgICAgICAod2hlbiAoPiAobGVuZ3RoIHRoaXMtbmFtZSkgMCkKICAgICAgICAgICAgICAg ICAgICAoc2V0cSBuYW1lIHRoaXMtbmFtZSkKLQkgICAgICAgICAgIChmZmFwLWZpbGUtZXhpc3Rz LXN0cmluZyBuYW1lKSkpKSkKKwkgICAgICAgICAgIChmZmFwLWZpbGUtZXhpc3RzLXN0cmluZyBu YW1lIG5pbCByZW1vdGUtcCkpKSkpCiAgICAgICAgICA7OyBGaWxlIGRvZXMgbm90IGV4aXN0LCB0 cnkgdGhlIGFsaXN0OgogCSAoKGxldCAoKGFsaXN0IGZmYXAtYWxpc3QpIHRlbSB0cnkgY2FzZS1m b2xkLXNlYXJjaCkKIAkgICAgKHdoaWxlIChhbmQgYWxpc3QgKG5vdCB0cnkpKQpAQCAtMTUxMCw3 ICsxNTMzLDcgQEAgZmZhcC1maWxlLWF0LXBvaW50CiAJCSAgICAgICAoc2V0cSB0cnkgKG9yCiAJ CQkJICAoZmZhcC11cmwtcCB0cnkpIDsgbm90IGEgZmlsZSEKIAkJCQkgIChmZmFwLWZpbGUtcmVt b3RlLXAgdHJ5KQotCQkJCSAgKGZmYXAtZmlsZS1leGlzdHMtc3RyaW5nIHRyeSkpKSkpKQorCQkJ CSAgKGZmYXAtZmlsZS1leGlzdHMtc3RyaW5nIHRyeSBuaWwgcmVtb3RlLXApKSkpKSkKIAkgICAg dHJ5KSkKICAgICAgICAgIDs7IFRyeSBhZGRpbmcgYSBsZWFkaW5nICIvIiAoY29tbW9uIG9taXNz aW9uIGluIGZ0cCBmaWxlIG5hbWVzKS4KICAgICAgICAgIDs7IE5vdGUgdGhhdCB0aGlzIHVzZXMg b25hbWUsIHdoaWNoIHN0aWxsIGhhcyBhbnkgY29sb24gcGFydC4KQEAgLTE1NDMsMTcgKzE1NjYs MTggQEAgZmZhcC1maWxlLWF0LXBvaW50CiAJICAgICAgIChzdHJpbmctbWF0Y2ggZmZhcC1kaXJl ZC13aWxkY2FyZHMgbmFtZSkKIAkgICAgICAgYWJzCiAJICAgICAgIChmZmFwLWZpbGUtZXhpc3Rz LXN0cmluZyAoZmlsZS1uYW1lLWRpcmVjdG9yeQotCQkJCQkgKGRpcmVjdG9yeS1maWxlLW5hbWUg bmFtZSkpKQorCQkJCQkgKGRpcmVjdG9yeS1maWxlLW5hbWUgbmFtZSkpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsIHJlbW90ZS1wKQogCSAgICAgICBuYW1lKSkK ICAgICAgICAgIDs7IFRyeSBhbGwgcGFyZW50IGRpcmVjdG9yaWVzIGJ5IGRlbGV0aW5nIHRoZSB0 cmFpbGluZyBkaXJlY3RvcnkKICAgICAgICAgIDs7IG5hbWUgdW50aWwgZXhpc3RpbmcgZGlyZWN0 b3J5IGlzIGZvdW5kIG9yIG5hbWUgc3RvcHMgY2hhbmdpbmcKICAgICAgICAgICgobGV0ICgoZGly IG5hbWUpKQogICAgICAgICAgICAgKHdoaWxlIChhbmQgZGlyCi0gICAgICAgICAgICAgICAgICAg ICAgICAobm90IChmZmFwLWZpbGUtZXhpc3RzLXN0cmluZyBkaXIpKQorICAgICAgICAgICAgICAg ICAgICAgICAgKG5vdCAoZmZhcC1maWxlLWV4aXN0cy1zdHJpbmcgZGlyIG5pbCByZW1vdGUtcCkp CiAgICAgICAgICAgICAgICAgICAgICAgICAobm90IChlcXVhbCBkaXIgKHNldHEgZGlyIChmaWxl LW5hbWUtZGlyZWN0b3J5CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoZGlyZWN0b3J5LWZpbGUtbmFtZSBkaXIpKSkpKSkpCiAgICAgICAgICAgICAo YW5kIChub3QgKHN0cmluZz0gZGlyICIvIikpCi0JCSAoZmZhcC1maWxlLWV4aXN0cy1zdHJpbmcg ZGlyKSkpKQorCQkgKGZmYXAtZmlsZS1leGlzdHMtc3RyaW5nIGRpciBuaWwgcmVtb3RlLXApKSkp CiAJICkKICAgICAgIChzZXQtbWF0Y2gtZGF0YSBkYXRhKSkpKQogDApkaWZmIC0tZ2l0IGEvdGVz dC9saXNwL2ZmYXAtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZmZhcC10ZXN0cy5lbAppbmRleCBlYTVl NzQ1YmZhZi4uMmJmNWQ4Yzc5Y2QgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9mZmFwLXRlc3RzLmVs CisrKyBiL3Rlc3QvbGlzcC9mZmFwLXRlc3RzLmVsCkBAIC0yNSw2ICsyNSw3IEBACiAKIChyZXF1 aXJlICdjbC1saWIpCiAocmVxdWlyZSAnZXJ0KQorKHJlcXVpcmUgJ3RyYW1wKQogKHJlcXVpcmUg J2VydC14KQogKHJlcXVpcmUgJ2ZmYXApCiAKQEAgLTI4OSw2ICsyOTAsMjcgQEAgZmZhcC10ZXN0 cy0tYy1wYXRoL2NsYW5nLW1vY2tlZAogICAgIChzaG91bGQgKG1lbWJlciAoZXhwYW5kLWZpbGUt bmFtZSAiL0FwcGxpY2F0aW9ucy9YY29kZS5hcHAvQ29udGVudHMvRGV2ZWxvcGVyL1Rvb2xjaGFp bnMvWGNvZGVEZWZhdWx0LnhjdG9vbGNoYWluL3Vzci9saWIvY2xhbmcvMTUuMC4wL2luY2x1ZGUi KQogICAgICAgICAgICAgICAgICAgICAoZmZhcC0tYy1wYXRoKSkpKSkKIAorKGVydC1kZWZ0ZXN0 IGZmYXAtdGVzdC1yZW1vdGUgKCkKKyAgKHNraXAtdW5sZXNzCisgICAoaWdub3JlLWVycm9ycwor ICAgICAoYW5kCisgICAgICAoZmlsZS1yZW1vdGUtcCBlcnQtcmVtb3RlLXRlbXBvcmFyeS1maWxl LWRpcmVjdG9yeSkKKyAgICAgIChmaWxlLWRpcmVjdG9yeS1wIGVydC1yZW1vdGUtdGVtcG9yYXJ5 LWZpbGUtZGlyZWN0b3J5KQorICAgICAgKGZpbGUtd3JpdGFibGUtcCBlcnQtcmVtb3RlLXRlbXBv cmFyeS1maWxlLWRpcmVjdG9yeSkpKSkKKyAgKGxldCogKChmZmFwLXByZWZlci1yZW1vdGUtZmls ZSB0KQorICAgICAgICAgKGRlZmF1bHQtZGlyZWN0b3J5CisgICAgICAgICAgKGV4cGFuZC1maWxl LW5hbWUgZXJ0LXJlbW90ZS10ZW1wb3JhcnktZmlsZS1kaXJlY3RvcnkpKQorICAgICAgICAgKHRl c3QtZmlsZSAoZXhwYW5kLWZpbGUtbmFtZSAiZmZhcC10ZXN0IiBkZWZhdWx0LWRpcmVjdG9yeSkp KQorICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAoaWdub3JlLWVycm9ycyAobWFrZS1lbXB0 eS1maWxlIHRlc3QtZmlsZSkpCisgICAgICAoaW5zZXJ0IChmaWxlLWxvY2FsLW5hbWUgdGVzdC1m aWxlKSkKKyAgICAgIChzaG91bGQgKGVxdWFsIChmZmFwLWZpbGUtYXQtcG9pbnQpIHRlc3QtZmls ZSkpCisgICAgICAoZXJhc2UtYnVmZmVyKQorICAgICAgKGluc2VydCAoY29uY2F0ICIvdXNyL2Jp bjoiIChmaWxlLWxvY2FsLW5hbWUgdGVzdC1maWxlKSkpCisgICAgICAoc2hvdWxkIChlcXVhbCAo ZmZhcC1maWxlLWF0LXBvaW50KSB0ZXN0LWZpbGUpKQorICAgICAgKGRlbGV0ZS1maWxlIHRlc3Qt ZmlsZSkKKyAgICAgIChzaG91bGQgKGVxdWFsIChmZmFwLWZpbGUtYXQtcG9pbnQpIGRlZmF1bHQt ZGlyZWN0b3J5KSkpKSkKKwogKHByb3ZpZGUgJ2ZmYXAtdGVzdHMpCiAKIDs7OyBmZmFwLXRlc3Rz LmVsIGVuZHMgaGVyZQotLSAKMi4yNS4xCgo= --000000000000c789be063953e213-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 07 13:17:39 2025 Received: (at 78925) by debbugs.gnu.org; 7 Jul 2025 17:17:39 +0000 Received: from localhost ([127.0.0.1]:37505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uYpTG-0001ZE-Q9 for submit@debbugs.gnu.org; Mon, 07 Jul 2025 13:17:39 -0400 Received: from mout.gmx.net ([212.227.15.19]:46453) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uYpTD-0001YY-Gn for 78925@debbugs.gnu.org; Mon, 07 Jul 2025 13:17:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1751908643; x=1752513443; i=michael.albinus@gmx.de; bh=rDxsV8gaX7f/qtZ3rlEZeuSpSqnqOexMrQJPWn+NdQo=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type:cc:content-transfer-encoding: content-type:date:from:message-id:mime-version:reply-to:subject: to; b=pmHhJT4Mjn0OK85Cx/r1VlhhKA1J7MLJSTLRfUQoAo9Ln2Gy9NgY69ULGBGrUsos oCSYAqnXSvSXiNkZOobnrzBk/0eXM8BuJllEk4ETeZtxK02tXUEmn1bbVniqdFBxW 5qV40eQzoDxgrCVyFQbUHxrXOekFGeAudw3oD8JBCt+wA43A7d38mwwu+eEa7ni9X +72GIxjA0MtN2U6L5PB/9uGjXXAKTBdoDHBZ6nHCLPSNaOyVp/pvI6NHBwBGeaeBh LFc/xyR3g8LAYJaPGleC0wTTu5Wxu27n+sYKjxcpAlqVRr5az7ZqaX/lsY35+PyYp E4EkSBiIY11R46IfyQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from gandalf.gmx.de ([185.89.37.61]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N1wlv-1ufx7L1fon-010ZwJ; Mon, 07 Jul 2025 19:17:22 +0200 From: Michael Albinus To: Liu Hui Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files, [PATCH] Add option 'ffap-prefer-remote-file' (bug#78925) In-Reply-To: References: <86ecv14c9o.fsf@gnu.org> Date: Mon, 07 Jul 2025 19:17:21 +0200 Message-ID: <875xg3c44e.fsf_-_@gmx.de> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:4gxQt7Ed+HHKnjXMp/t+ssCQ9PD4nNUhghhBCBSATx+6enezhhS Jei2PLHG2+zF0N9e+e82b0rbHoIZGdLyHe6vVkGPS8nlaEvmAjns8fAGjFXEcBpEYDYT87R iGrKfFZHXjCe2eGhwJCxUSSUANZE8a1qb5El6sVPqB898IF7NrOzkZ3LvuBtfdZuVYU3YTr kYuPRasm3EgFG1uKhD0ZA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:jgNagyQQS8M=;CkdUQS6xx+sEtoAiprF12Xe8RCf 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 UdF+uXxjR1Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 78925 Cc: Eli Zaretskii , 78925@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Liu Hui writes: Hi, > The attached patch adds an option 'ffap-prefer-remote-file', which > defaults to nil. A non-nil value means ffap always finds remote files > for absolute filenames in remote case, instead of finding local files > first. Thank you for the patch. I don't use ffap myself, so just some comments from cursory review. > +--- > +*** New user option 'ffap-prefer-remote-file'. > +If non-nil, ffap always finds remote files in buffers with remote > +'default-directory'. If nil, ffap finds local files first for absolute > +filenames in above buffers. The default is nil. Please spell it out FFAP. > -(defun ffap-file-exists-string (file &optional nomodify) > +(defun ffap-file-exists-string (file &optional nomodify remote-host) A remote file name is not only the host. There are also, at least, a method and a user. Please call this argument remote-prefix or alike. > + ((or (not file) ; quietly reject nil > + (zerop (length file))) ; and also "" > + nil) aka ((zerop (length file)) nil) > + ((and remote-host ; prepend remote host to file > + (file-name-absolute-p file) > + (setq file (concat remote-host file)) > + nil)) What, if file is already remote? Shouldn't the check be --8<---------------cut here---------------start------------->8--- ((and remote-host ; prepend remote host to file (file-name-absolute-p file) (not (file-name-remote-p file)) (setq file (concat remote-host file)) nil)) --8<---------------cut here---------------end--------------->8--- > (require 'cl-lib) > (require 'ert) > +(require 'tramp) > (require 'ert-x) > (require 'ffap) Why Tramp? I guess it isn't needed. > + (let* ((ffap-prefer-remote-file t) > + (default-directory > + (expand-file-name ert-remote-temporary-file-directory)) > + (test-file (expand-file-name "ffap-test" default-directory))) I would use (make-temp-file "ffap-test") Best regards, Michael. From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 08 12:36:18 2025 Received: (at 78925) by debbugs.gnu.org; 8 Jul 2025 16:36:18 +0000 Received: from localhost ([127.0.0.1]:44179 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uZBIn-0003cg-JL for submit@debbugs.gnu.org; Tue, 08 Jul 2025 12:36:18 -0400 Received: from [2a00:1450:4864:20::432] (port=43197 helo=mail-wr1-x432.google.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uZ5Qi-0004as-Gs for 78925@debbugs.gnu.org; Tue, 08 Jul 2025 06:20:25 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3a4e742dc97so3260838f8f.0 for <78925@debbugs.gnu.org>; Tue, 08 Jul 2025 03:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751969992; x=1752574792; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=mcQizVWlduo5S65DytVWlizJ4QYO3J5T5L4jSc1MfTQ=; b=IwCyqeqvSGrdA4/Vtj50Ep+LWBSfCaa2huF3t3RNEJpakz+P64J2QN90UraLcn3ZBM WdSIOL+FT0ZIF82XrhDAvVOJjYbG0M8Gy3Mwl17GGpAVdkqQIktMlMf76Qy//FdteBQo uMHyJ+TSLMG70ximQLbhzA09i0xw63+x9FXqXThUXOSIvqdCzIAbNkCh5SX+NE0XLWLV ub+XkusdIILEjV6y564U51BKPPsE5Qe9w7OKE8pMWWM3069tpnBhL3Wcr8b64yikxUnq fqPLy+9LA27b/SLc2927YU9yAdWshqBm339iTJJRHeuZGx3YHcDotFrQp+Jvuq+nCnXd HNpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751969992; x=1752574792; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mcQizVWlduo5S65DytVWlizJ4QYO3J5T5L4jSc1MfTQ=; b=StBKeT2eIqjzkQ//9GSydqZorRrZ9M+AZOaWYTjnNstgQMQ6jNyZ7QcyJAcUYKHrji IDRitgckgAk5/mGJZBPGEbFdERiPGuq0zV9ImNN1KbOk5MWUqKkzxSQmuXxn8hkxHdNm h4m+ieM089oGFEteloBLIwI9oIo7rZbPTchdrEF2rWyUGoKnW8yONKoaNYQbLuMXLcS8 d5ox6OzMXFBQx8Hja86iTJifTuz/DqgDik820zNrDHBGe7/iE/+7KlCW4b+oV2qOnga5 31RBPJ91vwwgwPY6cNrwFwdsLDa0VXN9Yn+X1CzINiPKxlxwmWeomw6M5hNHisECd75L Y74A== X-Forwarded-Encrypted: i=1; AJvYcCWGMEmm606Q6epTDQC5VGo866igUtWlm+Z/wDDZvn48GQCoC7DDpLtjRERL/YlzuwYOgywiGQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YwJYSD/3hfWK3M5obSyJ4FQ4+cmAX2FmdAJuw0b3Kn17u98HXwH vpAvlhq6WEyPAchS6mJ8JLFCv3CtFylU7hZBqTIqpYVkipdU7ToGE76338ItRoz7S2qnqJWvXni Lajn/6OAve4sW9NgBk24pPdQo9RP7yd8= X-Gm-Gg: ASbGncuua2p4eQVBhwBYtyM1SH+XKcdV/R0AEno6qjbLAukz4H/CI/+5+ddJQKweQDR qlXXFWaulmgLIjub57OemggqkaAL/GiHwSxDXKUeypMltIf4A1ugxvkZjUYHoLgLIZW6CUsd9fm yTW+ceI1g35VnSATIEzJQt1HCC2EJqImBPyKcB846pOtw= X-Google-Smtp-Source: AGHT+IHJsZzvDd8wrrvyGXOqKZF+a6VA7ULz4fcDxhgCuX1Hdh5Op+0m74t/cqZKEN8obaNuViSrr3UpKNTrZFFufJg= X-Received: by 2002:a05:6000:2c10:b0:3aa:ac7b:705a with SMTP id ffacd0b85a97d-3b5ddfc62cfmr1759796f8f.11.1751969991933; Tue, 08 Jul 2025 03:19:51 -0700 (PDT) MIME-Version: 1.0 References: <86ecv14c9o.fsf@gnu.org> <875xg3c44e.fsf_-_@gmx.de> In-Reply-To: <875xg3c44e.fsf_-_@gmx.de> From: Liu Hui Date: Tue, 8 Jul 2025 18:19:39 +0800 X-Gm-Features: Ac12FXyUnkwcxSqUVjLIvHwkjWxRJZDP82SGHTTaCj0EZNwECZ3lk02JBiLaOLA Message-ID: Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files, [PATCH] Add option 'ffap-prefer-remote-file' (bug#78925) To: Michael Albinus Content-Type: multipart/mixed; boundary="00000000000006dbdf0639684ddd" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Tue, Jul 8, 2025 at 1:17 AM Michael Albinus wrote: > > Liu Hui writes: > > Hi, > > > The attached patch adds an option 'ffap-prefer-remote-file', which > > defaults to nil. A non-nil value me [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liuhui1610[at]gmail.com) 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) 0.0 T_SPF_HELO_TEMPERROR SPF: test of HELO record failed (temperror) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (liuhui1610[at]gmail.com) 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS 0.0 SPOOFED_FREEMAIL_NO_RDNS From SPOOFED_FREEMAIL and no rDNS X-Debbugs-Envelope-To: 78925 Cc: Eli Zaretskii , 78925@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) --00000000000006dbdf0639684ddd Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Jul 8, 2025 at 1:17=E2=80=AFAM Michael Albinus wrote: > > Liu Hui writes: > > Hi, > > > The attached patch adds an option 'ffap-prefer-remote-file', which > > defaults to nil. A non-nil value means ffap always finds remote files > > for absolute filenames in remote case, instead of finding local files > > first. > > Thank you for the patch. I don't use ffap myself, so just some comments > from cursory review. Thanks for your comments! > > +--- > > +*** New user option 'ffap-prefer-remote-file'. > > +If non-nil, ffap always finds remote files in buffers with remote > > +'default-directory'. If nil, ffap finds local files first for absolut= e > > +filenames in above buffers. The default is nil. > > Please spell it out FFAP. Done. > > -(defun ffap-file-exists-string (file &optional nomodify) > > +(defun ffap-file-exists-string (file &optional nomodify remote-host) > > A remote file name is not only the host. There are also, at least, a > method and a user. Please call this argument remote-prefix or alike. Renamed to remote-prefix. > > + ((or (not file) ; quietly reject nil > > + (zerop (length file))) ; and also "" > > + nil) > > aka ((zerop (length file)) nil) Done. > > + ((and remote-host ; prepend remote host to file > > + (file-name-absolute-p file) > > + (setq file (concat remote-host file)) > > + nil)) > > What, if file is already remote? Shouldn't the check be > > --8<---------------cut here---------------start------------->8--- > ((and remote-host ; prepend remote host to file > (file-name-absolute-p file) > (not (file-name-remote-p file)) > (setq file (concat remote-host file)) > nil)) > --8<---------------cut here---------------end--------------->8--- I examined the callers (e.g. ffap-file-at-point) and they have ruled out the possibility that file is remote by ffap-file-remote-p. So it wasn't checked again here. The docstring has been revised to clarify the usage of the new argument. > > (require 'cl-lib) > > (require 'ert) > > +(require 'tramp) > > (require 'ert-x) > > (require 'ffap) > > Why Tramp? I guess it isn't needed. The comment of ert-remote-temporary-file-directory: ;; If this defvar is used in a test file, `tramp' shall be loaded ;; prior `ert-x'. There is no default value on w32 systems, which ;; could work out of the box. Otherwise, the remote test is skipped with 'make test/ffap-tests'. > > + (let* ((ffap-prefer-remote-file t) > > + (default-directory > > + (expand-file-name ert-remote-temporary-file-directory)) > > + (test-file (expand-file-name "ffap-test" default-directory))) > > I would use (make-temp-file "ffap-test") Done. --00000000000006dbdf0639684ddd Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Add-option-ffap-prefer-remote-file-bug-78925.patch" Content-Disposition: attachment; filename="0001-Add-option-ffap-prefer-remote-file-bug-78925.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_mcudl4la0 RnJvbSAwZTU4NjJjOGM2OTlhYzRhZWUwMTMzZjA1ZjZhZGQ2YTk0MzExMDEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog VHVlLCA4IEp1bCAyMDI1IDE4OjAxOjUxICswODAwClN1YmplY3Q6IFtQQVRDSF0gQWRkIG9wdGlv biAnZmZhcC1wcmVmZXItcmVtb3RlLWZpbGUnIChidWcjNzg5MjUpCgpUaGlzIG9wdGlvbiBvbmx5 IGFmZmVjdHMgYWJzb2x1dGUgZmlsZW5hbWVzIHRoYXQgYXJlIGZvdW5kIGJ5CmZmYXAtZmlsZS1h dC1wb2ludCBpbiBidWZmZXJzIHdpdGggcmVtb3RlIGRlZmF1bHQgZGlyZWN0b3J5LgoKVGhlIGhh bmRsaW5nIG9mIHJlbGF0aXZlIGZpbGVuYW1lcyBpbiBhYm92ZSBidWZmZXJzIHJlbWFpbnMKdW5j aGFuZ2VkOiBmZmFwLWZpbGUtYXQtcG9pbnQgcmV0dXJucyB0aGUgcmVsYXRpdmUgZmlsZW5hbWUs CndoaWNoIGNhbiBiZSBjb252ZXJ0ZWQgdG8gYSByZW1vdGUgYWJzb2x1dGUgZmlsZW5hbWUgYnkK c3Vic2VxdWVudCBjYWxsZXJzIChlLmcuIGZmYXApIHVzaW5nIGV4cGFuZC1maWxlLW5hbWUuCgoq IGxpc3AvZmZhcC5lbCAoZmZhcC1wcmVmZXItcmVtb3RlLWZpbGUpOiBOZXcgdXNlciBvcHRpb24u CihmZmFwLWZpbGUtZXhpc3RzLXN0cmluZyk6IEFkZCBhbiBvcHRpb25hbCBhcmd1bWVudCB0byBh bGxvdyB0aGUKY2hlY2sgb2YgZXhpc3RlbmNlIG9mIGFic29sdXRlIGZpbGVuYW1lIG9uIHRoZSBy ZW1vdGUgaG9zdC4KKGZmYXAtZmlsZS1hdC1wb2ludCk6IEFsd2F5cyBmaW5kIHJlbW90ZSBmaWxl cyBpbiByZW1vdGUgY29udGV4dAppZiB0aGUgbmV3IG9wdGlvbiBpcyBub24tbmlsLgoqIHRlc3Qv bGlzcC9mZmFwLXRlc3RzLmVsIChmZmFwLXRlc3QtcmVtb3RlKTogQWRkIGEgdGVzdC4KKiBldGMv TkVXUzogQW5ub3VuY2UgdGhlIGNoYW5nZS4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgICB8 ICA2ICsrKysKIGxpc3AvZmZhcC5lbCAgICAgICAgICAgIHwgNzMgKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0KIHRlc3QvbGlzcC9mZmFwLXRlc3RzLmVsIHwgMjIgKysr KysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA3NiBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdTCmluZGV4IDQzNDc3ZDQzOGMz Li5kZjFkMzU4ZmRiYSAxMDA2NDQKLS0tIGEvZXRjL05FV1MKKysrIGIvZXRjL05FV1MKQEAgLTIy MTUsNiArMjIxNSwxMiBAQCB3aGljaCBhbHJlYWR5IHRha2VzIHRoaXMgYXJndW1lbnQgZm9yIGEg c2luZ2xlIGF0dHJpYnV0ZS4gIFRoaXMgaXMKIHVzZWZ1bCB3aGVuIHlvdSB3YW50IHRoZSBmYWNl IGF0dHJpYnV0ZXMgdG8gYmUgYWJzb2x1dGUgYW5kIG5vdAogJ3Vuc3BlY2lmaWVkJy4KIAorLS0t CisqKiogTmV3IHVzZXIgb3B0aW9uICdmZmFwLXByZWZlci1yZW1vdGUtZmlsZScuCitJZiBub24t bmlsLCBGRkFQIGFsd2F5cyBmaW5kcyByZW1vdGUgZmlsZXMgaW4gYnVmZmVycyB3aXRoIHJlbW90 ZQorJ2RlZmF1bHQtZGlyZWN0b3J5Jy4gIElmIG5pbCwgRkZBUCBmaW5kcyBsb2NhbCBmaWxlcyBm aXJzdCBmb3IgYWJzb2x1dGUKK2ZpbGVuYW1lcyBpbiBhYm92ZSBidWZmZXJzLiAgVGhlIGRlZmF1 bHQgaXMgbmlsLgorCiAtLS0KICoqIEZseW1ha2UKIApkaWZmIC0tZ2l0IGEvbGlzcC9mZmFwLmVs IGIvbGlzcC9mZmFwLmVsCmluZGV4IDEwYWZjZDk1MTRhLi40NzY2YjNmMjA4YSAxMDA2NDQKLS0t IGEvbGlzcC9mZmFwLmVsCisrKyBiL2xpc3AvZmZhcC5lbApAQCAtMTk5LDYgKzE5OSwxNiBAQCBm ZmFwLWZvby1hdC1iYXItcHJlZml4CiAJCSApCiAgIDpncm91cCAnZmZhcCkKIAorKGRlZmN1c3Rv bSBmZmFwLXByZWZlci1yZW1vdGUtZmlsZSBuaWwKKyAgIldoZXRoZXIgdG8gcHJlZmVyIHJlbW90 ZSBmaWxlcyBpbiByZW1vdGUgY29udGV4dC4KK0lmIG5vbi1uaWwsIGZmYXAgYWx3YXlzIGZpbmRz IHJlbW90ZSBmaWxlcyBpbiBidWZmZXJzIHdpdGggcmVtb3RlCitgZGVmYXVsdC1kaXJlY3Rvcnkn LiAgSWYgbmlsLCBmZmFwIGZpbmRzIGxvY2FsIGZpbGVzIGZpcnN0IGZvciBhYnNvbHV0ZQorZmls ZW5hbWVzIGluIGFib3ZlIGJ1ZmZlcnMuICBSZWxhdGl2ZSBmaWxlbmFtZXMgYXJlIG5vdCBhZmZl Y3RlZCBieSB0aGlzCitvcHRpb24uIgorICA6dHlwZSAnYm9vbGVhbgorICA6Z3JvdXAgJ2ZmYXAK KyAgOnZlcnNpb24gIjMxLjEiKQorCiAoZGVmdmFyIGZmYXAtbWF4LXJlZ2lvbi1sZW5ndGggMTAy NAogICAiTWF4aW11bSBhY3RpdmUgcmVnaW9uIGxlbmd0aC4KIFdoZW4gdGhlIHJlZ2lvbiBpcyBh Y3RpdmUgYW5kIGxhcmdlciB0aGFuIHRoaXMgdmFsdWUsCkBAIC00ODgsNyArNDk4LDcgQEAgZmZh cC1maWxlLXN1ZmZpeAogKGRlZnZhciBmZmFwLWNvbXByZXNzaW9uLXN1ZmZpeGVzICcoIi5neiIg Ii5aIikJOyAueiBpcyBtb3N0bHkgZGVhZAogICAiTGlzdCBvZiBzdWZmaXhlcyB0cmllZCBieSBg ZmZhcC1maWxlLWV4aXN0cy1zdHJpbmcnLiIpCiAKLShkZWZ1biBmZmFwLWZpbGUtZXhpc3RzLXN0 cmluZyAoZmlsZSAmb3B0aW9uYWwgbm9tb2RpZnkpCisoZGVmdW4gZmZhcC1maWxlLWV4aXN0cy1z dHJpbmcgKGZpbGUgJm9wdGlvbmFsIG5vbW9kaWZ5IHJlbW90ZS1wcmVmaXgpCiAgIDs7IEVhcmx5 IGprYS1jb21wciB2ZXJzaW9ucyBtb2RpZmllZCBmaWxlLWV4aXN0cy1wIHRvIHJldHVybiB0aGUK ICAgOzsgZmlsZW5hbWUsIG1heWJlIG1vZGlmaWVkIGJ5IGFkZGluZyBhIHN1ZmZpeCBsaWtlICIu Z3oiLiAgVGhhdAogICA7OyBicm9rZSB0aGUgaW50ZXJmYWNlIG9mIGZpbGUtZXhpc3RzLXAsIHNv IGl0IHdhcyBsYXRlciBkcm9wcGVkLgpAQCAtNDk2LDIzICs1MDYsMzIgQEAgZmZhcC1maWxlLWV4 aXN0cy1zdHJpbmcKICAgIlJldHVybiBGSUxFIChtYXliZSBtb2RpZmllZCkgaWYgdGhlIGZpbGUg ZXhpc3RzLCBlbHNlIG5pbC4KIFdoZW4gdXNpbmcgamthLWNvbXByIChhLmsuYS4gYGF1dG8tY29t cHJlc3Npb24tbW9kZScpLCB0aGUgcmV0dXJuZWQKIG5hbWUgbWF5IGhhdmUgYSBzdWZmaXggYWRk ZWQgZnJvbSBgZmZhcC1jb21wcmVzc2lvbi1zdWZmaXhlcycuCi1UaGUgb3B0aW9uYWwgTk9NT0RJ RlkgYXJndW1lbnQgc3VwcHJlc3NlcyB0aGUgZXh0cmEgc2VhcmNoLiIKLSAgKGNvbmQKLSAgICgo b3IgKG5vdCBmaWxlKQkJCTsgcXVpZXRseSByZWplY3QgbmlsCi0JKHplcm9wIChsZW5ndGggZmls ZSkpKQkJOyBhbmQgYWxzbyAiIgotICAgIG5pbCkKLSAgICgoZmlsZS1leGlzdHMtcCBmaWxlKSBm aWxlKQkJOyB0cnkgdW5tb2RpZmllZCBmaXJzdAotICAgOzsgdGhyZWUgcmVhc29ucyB0byBzdXBw cmVzcyBzZWFyY2g6Ci0gICAobm9tb2RpZnkgbmlsKQotICAgKChub3QgKHJhc3NxICdqa2EtY29t cHItaGFuZGxlciBmaWxlLW5hbWUtaGFuZGxlci1hbGlzdCkpIG5pbCkKLSAgICgobWVtYmVyIChm aWxlLW5hbWUtZXh0ZW5zaW9uIGZpbGUgdCkgZmZhcC1jb21wcmVzc2lvbi1zdWZmaXhlcykgbmls KQotICAgKHQJCQkJCTsgb2ssIGRvIHRoZSBzZWFyY2gKLSAgICAobGV0ICgobGlzdCBmZmFwLWNv bXByZXNzaW9uLXN1ZmZpeGVzKSB0cnkgcmV0KQotICAgICAgKHdoaWxlIGxpc3QKLQkoaWYgKGZp bGUtZXhpc3RzLXAgKHNldHEgdHJ5IChjb25jYXQgZmlsZSAoY2FyIGxpc3QpKSkpCi0JICAgIChz ZXRxIHJldCB0cnkgbGlzdCBuaWwpCi0JICAoc2V0cSBsaXN0IChjZHIgbGlzdCkpKSkKLSAgICAg IHJldCkpKSkKK1RoZSBvcHRpb25hbCBOT01PRElGWSBhcmd1bWVudCBzdXBwcmVzc2VzIHRoZSBl eHRyYSBzZWFyY2guCisKK0lmIHRoZSBjYWxsZXIgZW5zdXJlcyB0aGF0IEZJTEUgaXMgbm90IHJl bW90ZSwgdGhpcyBmdW5jdGlvbiBjYW4gYWNjZXB0CithbiBvcHRpb25hbCBhcmd1bWVudCwgUkVN T1RFLVBSRUZJWC4gIFdoZW4gUkVNT1RFLVBSRUZJWCBpcyBub24tbmlsIChhCitzdHJpbmcgdHlw aWNhbGx5IHJldHVybmVkIGJ5IGBmaWxlLXJlbW90ZS1wJykgYW5kIEZJTEUgaXMgYWJzb2x1dGUs CitjaGVjayB3aGV0aGVyIEZJTEUgZXhpc3RzIG9uIHRoZSByZW1vdGUgc3lzdGVtLiAgSWYgdGhl IGZpbGUgaXMgcHJlc2VudCwKK3RoZSByZXR1cm5lZCBuYW1lIHVzZXMgUkVNT1RFLVBSRUZJWCBh cyB0aGUgcHJlZml4LiIKKyAgKGxldCAoKG5vbi1lc3NlbnRpYWwgdCkpCisgICAgKGNvbmQKKyAg ICAgKCh6ZXJvcCAobGVuZ3RoIGZpbGUpKSBuaWwpICAgICAgICA7IHF1aWV0bHkgcmVqZWN0IG5p bCBhbmQgIiIKKyAgICAgKChhbmQgcmVtb3RlLXByZWZpeCAgICAgICAgICAgICAgICA7IHByZXBl bmQgcmVtb3RlIHByZWZpeCB0byBmaWxlCisgICAgICAgICAgIChmaWxlLW5hbWUtYWJzb2x1dGUt cCBmaWxlKQorICAgICAgICAgICAoc2V0cSBmaWxlIChjb25jYXQgcmVtb3RlLXByZWZpeCBmaWxl KSkKKyAgICAgICAgICAgbmlsKSkKKyAgICAgKChmaWxlLWV4aXN0cy1wIGZpbGUpIGZpbGUpCisg ICAgIDs7IHRocmVlIHJlYXNvbnMgdG8gc3VwcHJlc3Mgc2VhcmNoOgorICAgICAobm9tb2RpZnkg bmlsKQorICAgICAoKG5vdCAocmFzc3EgJ2prYS1jb21wci1oYW5kbGVyIGZpbGUtbmFtZS1oYW5k bGVyLWFsaXN0KSkgbmlsKQorICAgICAoKG1lbWJlciAoZmlsZS1uYW1lLWV4dGVuc2lvbiBmaWxl IHQpIGZmYXAtY29tcHJlc3Npb24tc3VmZml4ZXMpIG5pbCkKKyAgICAgKHQJCQkJCTsgb2ssIGRv IHRoZSBzZWFyY2gKKyAgICAgIChsZXQgKChsaXN0IGZmYXAtY29tcHJlc3Npb24tc3VmZml4ZXMp IHRyeSByZXQpCisgICAgICAgICh3aGlsZSBsaXN0CisJICAoaWYgKGZpbGUtZXhpc3RzLXAgKHNl dHEgdHJ5IChjb25jYXQgZmlsZSAoY2FyIGxpc3QpKSkpCisJICAgICAgKHNldHEgcmV0IHRyeSBs aXN0IG5pbCkKKwkgICAgKHNldHEgbGlzdCAoY2RyIGxpc3QpKSkpCisgICAgICAgIHJldCkpKSkp CiAKIChkZWZ1biBmZmFwLWZpbGUtcmVtb3RlLXAgKGZpbGVuYW1lKQogICAiSWYgRklMRU5BTUUg bG9va3MgcmVtb3RlLCByZXR1cm4gaXQgKG1heWJlIHNsaWdodGx5IGltcHJvdmVkKS4iCkBAIC0x NDY1LDYgKzE0ODQsOCBAQCBmZmFwLWZpbGUtYXQtcG9pbnQKIAkgICAgICBzdHJpbmcpKQogCSAo YWJzIChmaWxlLW5hbWUtYWJzb2x1dGUtcCBuYW1lKSkKIAkgKGRlZmF1bHQtZGlyZWN0b3J5IGRl ZmF1bHQtZGlyZWN0b3J5KQorICAgICAgICAgKHJlbW90ZS1wIChhbmQgZmZhcC1wcmVmZXItcmVt b3RlLWZpbGUKKyAgICAgICAgICAgICAgICAgICAgICAgIChmaWxlLXJlbW90ZS1wIGRlZmF1bHQt ZGlyZWN0b3J5KSkpCiAgICAgICAgICAob25hbWUgbmFtZSkpCiAgICAgKHVud2luZC1wcm90ZWN0 CiAJKGNvbmQKQEAgLTE0ODQsMTAgKzE1MDUsMTEgQEAgZmZhcC1maWxlLWF0LXBvaW50CiAJIDs7 IEFjY2VwdCByZW1vdGUgbmFtZXMgd2l0aG91dCBhY3R1YWwgY2hlY2tpbmcgKHRvbyBzbG93KToK IAkgKChhbmQgYWJzIChmZmFwLWZpbGUtcmVtb3RlLXAgbmFtZSkpKQogCSA7OyBPaywgbm90IHJl bW90ZSwgdHJ5IHRoZSBleGlzdGVuY2UgdGVzdCBldmVuIGlmIGl0IGlzIGFic29sdXRlOgotCSAo KGFuZCBhYnMgKGZmYXAtZmlsZS1leGlzdHMtc3RyaW5nIG5hbWUpKSkKKwkgKChhbmQgYWJzIChm ZmFwLWZpbGUtZXhpc3RzLXN0cmluZyBuYW1lIG5pbCByZW1vdGUtcCkpKQogCSA7OyBUcnkgc3Ry aXBwaW5nIG9mZiBsaW5lIG51bWJlcnMuCiAJICgoYW5kIGFicyAoc3RyaW5nLW1hdGNoICI6WzAt OV0iIG5hbWUpCi0JICAgICAgIChmZmFwLWZpbGUtZXhpc3RzLXN0cmluZyAoc3Vic3RyaW5nIG5h bWUgMCAobWF0Y2gtYmVnaW5uaW5nIDApKSkpKQorCSAgICAgICAoZmZhcC1maWxlLWV4aXN0cy1z dHJpbmcgKHN1YnN0cmluZyBuYW1lIDAgKG1hdGNoLWJlZ2lubmluZyAwKSkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWwgcmVtb3RlLXApKSkKIAkgOzsgSWYgaXQg Y29udGFpbnMgYSBjb2xvbiwgZ2V0IHJpZCBvZiBpdCAoYW5kIHJldHVybiBpZiBleGlzdHMpCiAJ ICgoYW5kIChzdHJpbmctbWF0Y2ggcGF0aC1zZXBhcmF0b3IgbmFtZSkKIAkgICAgICAgKGxldCAo KHRoaXMtbmFtZSAoZmZhcC1zdHJpbmctYXQtcG9pbnQgJ25vY29sb24pKSkKQEAgLTE0OTUsNyAr MTUxNyw3IEBAIGZmYXAtZmlsZS1hdC1wb2ludAogICAgICAgICAgICAgICAgICA7OyB0aGUgZW1w dHkgc3RyaW5nLgogCSAgICAgICAgICh3aGVuICg+IChsZW5ndGggdGhpcy1uYW1lKSAwKQogICAg ICAgICAgICAgICAgICAgIChzZXRxIG5hbWUgdGhpcy1uYW1lKQotCSAgICAgICAgICAgKGZmYXAt ZmlsZS1leGlzdHMtc3RyaW5nIG5hbWUpKSkpKQorCSAgICAgICAgICAgKGZmYXAtZmlsZS1leGlz dHMtc3RyaW5nIG5hbWUgbmlsIHJlbW90ZS1wKSkpKSkKICAgICAgICAgIDs7IEZpbGUgZG9lcyBu b3QgZXhpc3QsIHRyeSB0aGUgYWxpc3Q6CiAJICgobGV0ICgoYWxpc3QgZmZhcC1hbGlzdCkgdGVt IHRyeSBjYXNlLWZvbGQtc2VhcmNoKQogCSAgICAod2hpbGUgKGFuZCBhbGlzdCAobm90IHRyeSkp CkBAIC0xNTEwLDcgKzE1MzIsNyBAQCBmZmFwLWZpbGUtYXQtcG9pbnQKIAkJICAgICAgIChzZXRx IHRyeSAob3IKIAkJCQkgIChmZmFwLXVybC1wIHRyeSkgOyBub3QgYSBmaWxlIQogCQkJCSAgKGZm YXAtZmlsZS1yZW1vdGUtcCB0cnkpCi0JCQkJICAoZmZhcC1maWxlLWV4aXN0cy1zdHJpbmcgdHJ5 KSkpKSkpCisJCQkJICAoZmZhcC1maWxlLWV4aXN0cy1zdHJpbmcgdHJ5IG5pbCByZW1vdGUtcCkp KSkpKQogCSAgICB0cnkpKQogICAgICAgICAgOzsgVHJ5IGFkZGluZyBhIGxlYWRpbmcgIi8iIChj b21tb24gb21pc3Npb24gaW4gZnRwIGZpbGUgbmFtZXMpLgogICAgICAgICAgOzsgTm90ZSB0aGF0 IHRoaXMgdXNlcyBvbmFtZSwgd2hpY2ggc3RpbGwgaGFzIGFueSBjb2xvbiBwYXJ0LgpAQCAtMTU0 MywxNyArMTU2NSwxOCBAQCBmZmFwLWZpbGUtYXQtcG9pbnQKIAkgICAgICAgKHN0cmluZy1tYXRj aCBmZmFwLWRpcmVkLXdpbGRjYXJkcyBuYW1lKQogCSAgICAgICBhYnMKIAkgICAgICAgKGZmYXAt ZmlsZS1leGlzdHMtc3RyaW5nIChmaWxlLW5hbWUtZGlyZWN0b3J5Ci0JCQkJCSAoZGlyZWN0b3J5 LWZpbGUtbmFtZSBuYW1lKSkpCisJCQkJCSAoZGlyZWN0b3J5LWZpbGUtbmFtZSBuYW1lKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWwgcmVtb3RlLXApCiAJICAg ICAgIG5hbWUpKQogICAgICAgICAgOzsgVHJ5IGFsbCBwYXJlbnQgZGlyZWN0b3JpZXMgYnkgZGVs ZXRpbmcgdGhlIHRyYWlsaW5nIGRpcmVjdG9yeQogICAgICAgICAgOzsgbmFtZSB1bnRpbCBleGlz dGluZyBkaXJlY3RvcnkgaXMgZm91bmQgb3IgbmFtZSBzdG9wcyBjaGFuZ2luZwogICAgICAgICAg KChsZXQgKChkaXIgbmFtZSkpCiAgICAgICAgICAgICAod2hpbGUgKGFuZCBkaXIKLSAgICAgICAg ICAgICAgICAgICAgICAgIChub3QgKGZmYXAtZmlsZS1leGlzdHMtc3RyaW5nIGRpcikpCisgICAg ICAgICAgICAgICAgICAgICAgICAobm90IChmZmFwLWZpbGUtZXhpc3RzLXN0cmluZyBkaXIgbmls IHJlbW90ZS1wKSkKICAgICAgICAgICAgICAgICAgICAgICAgIChub3QgKGVxdWFsIGRpciAoc2V0 cSBkaXIgKGZpbGUtbmFtZS1kaXJlY3RvcnkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChkaXJlY3RvcnktZmlsZS1uYW1lIGRpcikpKSkpKSkKICAg ICAgICAgICAgIChhbmQgKG5vdCAoc3RyaW5nPSBkaXIgIi8iKSkKLQkJIChmZmFwLWZpbGUtZXhp c3RzLXN0cmluZyBkaXIpKSkpCisJCSAoZmZhcC1maWxlLWV4aXN0cy1zdHJpbmcgZGlyIG5pbCBy ZW1vdGUtcCkpKSkKIAkgKQogICAgICAgKHNldC1tYXRjaC1kYXRhIGRhdGEpKSkpCiAMCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvZmZhcC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9mZmFwLXRlc3RzLmVs CmluZGV4IGVhNWU3NDViZmFmLi5mODkxMTQ5ZTZkNiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2Zm YXAtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2ZmYXAtdGVzdHMuZWwKQEAgLTI1LDYgKzI1LDcg QEAKIAogKHJlcXVpcmUgJ2NsLWxpYikKIChyZXF1aXJlICdlcnQpCisocmVxdWlyZSAndHJhbXAp CiAocmVxdWlyZSAnZXJ0LXgpCiAocmVxdWlyZSAnZmZhcCkKIApAQCAtMjg5LDYgKzI5MCwyNyBA QCBmZmFwLXRlc3RzLS1jLXBhdGgvY2xhbmctbW9ja2VkCiAgICAgKHNob3VsZCAobWVtYmVyIChl eHBhbmQtZmlsZS1uYW1lICIvQXBwbGljYXRpb25zL1hjb2RlLmFwcC9Db250ZW50cy9EZXZlbG9w ZXIvVG9vbGNoYWlucy9YY29kZURlZmF1bHQueGN0b29sY2hhaW4vdXNyL2xpYi9jbGFuZy8xNS4w LjAvaW5jbHVkZSIpCiAgICAgICAgICAgICAgICAgICAgIChmZmFwLS1jLXBhdGgpKSkpKQogCiso ZXJ0LWRlZnRlc3QgZmZhcC10ZXN0LXJlbW90ZSAoKQorICAoc2tpcC11bmxlc3MKKyAgIChpZ25v cmUtZXJyb3JzCisgICAgIChhbmQKKyAgICAgIChmaWxlLXJlbW90ZS1wIGVydC1yZW1vdGUtdGVt cG9yYXJ5LWZpbGUtZGlyZWN0b3J5KQorICAgICAgKGZpbGUtZGlyZWN0b3J5LXAgZXJ0LXJlbW90 ZS10ZW1wb3JhcnktZmlsZS1kaXJlY3RvcnkpCisgICAgICAoZmlsZS13cml0YWJsZS1wIGVydC1y ZW1vdGUtdGVtcG9yYXJ5LWZpbGUtZGlyZWN0b3J5KSkpKQorICAobGV0KiAoKGZmYXAtcHJlZmVy LXJlbW90ZS1maWxlIHQpCisgICAgICAgICAoZGVmYXVsdC1kaXJlY3RvcnkKKyAgICAgICAgICAo ZXhwYW5kLWZpbGUtbmFtZSBlcnQtcmVtb3RlLXRlbXBvcmFyeS1maWxlLWRpcmVjdG9yeSkpCisg ICAgICAgICAodGVtcG9yYXJ5LWZpbGUtZGlyZWN0b3J5IGRlZmF1bHQtZGlyZWN0b3J5KQorICAg ICAgICAgKHRlc3QtZmlsZSAobWFrZS10ZW1wLWZpbGUgImZmYXAtdGVzdCIpKSkKKyAgICAod2l0 aC10ZW1wLWJ1ZmZlcgorICAgICAgKGluc2VydCAoZmlsZS1sb2NhbC1uYW1lIHRlc3QtZmlsZSkp CisgICAgICAoc2hvdWxkIChlcXVhbCAoZmZhcC1maWxlLWF0LXBvaW50KSB0ZXN0LWZpbGUpKQor ICAgICAgKGVyYXNlLWJ1ZmZlcikKKyAgICAgIChpbnNlcnQgKGNvbmNhdCAiL3Vzci9iaW46IiAo ZmlsZS1sb2NhbC1uYW1lIHRlc3QtZmlsZSkpKQorICAgICAgKHNob3VsZCAoZXF1YWwgKGZmYXAt ZmlsZS1hdC1wb2ludCkgdGVzdC1maWxlKSkKKyAgICAgIChkZWxldGUtZmlsZSB0ZXN0LWZpbGUp CisgICAgICAoc2hvdWxkIChlcXVhbCAoZmZhcC1maWxlLWF0LXBvaW50KSBkZWZhdWx0LWRpcmVj dG9yeSkpKSkpCisKIChwcm92aWRlICdmZmFwLXRlc3RzKQogCiA7OzsgZmZhcC10ZXN0cy5lbCBl bmRzIGhlcmUKLS0gCjIuMjUuMQoK --00000000000006dbdf0639684ddd-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 08 12:36:35 2025 Received: (at 78925) by debbugs.gnu.org; 8 Jul 2025 16:36:35 +0000 Received: from localhost ([127.0.0.1]:44186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uZBJ4-0003e2-MI for submit@debbugs.gnu.org; Tue, 08 Jul 2025 12:36:35 -0400 Received: from [212.227.15.15] (port=37335 helo=mout.gmx.net) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uZ5e1-0005iE-3x for 78925@debbugs.gnu.org; Tue, 08 Jul 2025 06:34:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1751970817; x=1752575617; i=michael.albinus@gmx.de; bh=4QUYC6bxTcICNhFmrUrvYw4d1WO90DBvzvbK2KcDBFw=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type:cc:content-transfer-encoding: content-type:date:from:message-id:mime-version:reply-to:subject: to; b=qevGY09Qa9zpqri8aLG2rtmWO3D73fks+pOZZqdfVmNRybKOuQp6BFU/g0YaZUqU PmirWcI+MmpJTVv9fSNeIqXtlshknQ1WAvREosjg44TfQo5nANQKYPe5apx5wFkyX C+lf0x648AY1RFN9tcXSnyobT7gr4jDCCosU4ciKyh5a1urqrE6GdJJEKcBYUptoh f/3bpRwFRfkxODWUaztVkFMjA8GpZiqP6Xyj/1hjy3UVmkW8hBokVX32Nu7ZX2Jj0 YHQQahShZ1SDqcuFUOBRzNaV/QjgX96GzLi0wfsqU1PoaN9Q2ChAkms6p0ohqX2Rv d7K3irFcCFWcrjVjrw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from gandalf.gmx.de ([185.89.37.61]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MG9gE-1uRLMC3GGq-00FDU7; Tue, 08 Jul 2025 12:33:36 +0200 From: Michael Albinus To: Liu Hui Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files, [PATCH] Add option 'ffap-prefer-remote-file' (bug#78925) In-Reply-To: References: <86ecv14c9o.fsf@gnu.org> <875xg3c44e.fsf_-_@gmx.de> Date: Tue, 08 Jul 2025 12:33:35 +0200 Message-ID: <87sej79dkw.fsf@gmx.de> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:27HydBVhNxda244KEq6XqFRDLPSRhie/3lTEWEU3UnUxHLYXmw2 rP3qXANvlUBWBqZcehd1FozaImoRHeHfehhQInNnmFWYugm0S5JrFuJ/7XhvhnVKLxJWULr EsMFhE9BX6mA3fmnLVrlthoVDSkg300hVtbGkaVjIZZ5hwhX5oN/rNBR5xZt9M5rIMF0SdS kyqfWyXkQOI/O5SiKQNAQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:ILcU5bZPEB4=;D01fOK+0DuIhE9MPP/iGi58S0i0 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 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Liu Hui writes: Hi, >> > (require 'cl-lib) >> > (require 'ert) >> > +(require 'tramp) >> > (require 'ert-x) >> > (require 'ffap) >> >> Why Tramp? I guess it isn't needed. > > The comment of ert-remote-temporary-file-dire [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (michael.albinus[at]gmx.de) 0.0 T_SPF_TEMPERROR SPF: test of record failed (temperror) 0.0 T_SPF_HELO_TEMPERROR SPF: test of HELO record failed (temperror) 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS 0.0 SPOOFED_FREEMAIL_NO_RDNS From SPOOFED_FREEMAIL and no rDNS X-Debbugs-Envelope-To: 78925 Cc: Eli Zaretskii , 78925@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) Liu Hui writes: Hi, >> > (require 'cl-lib) >> > (require 'ert) >> > +(require 'tramp) >> > (require 'ert-x) >> > (require 'ffap) >> >> Why Tramp? I guess it isn't needed. > > The comment of ert-remote-temporary-file-directory: > > ;; If this defvar is used in a test file, `tramp' shall be loaded > ;; prior `ert-x'. There is no default value on w32 systems, which > ;; could work out of the box. Ah, yes. I wrote this comment myself, but I tend to forget everything :-( Otherwise, the patch LGTM. Best regards, Michael. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 12 04:43:54 2025 Received: (at 78925-done) by debbugs.gnu.org; 12 Jul 2025 08:43:54 +0000 Received: from localhost ([127.0.0.1]:43718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uaVpq-0004dG-92 for submit@debbugs.gnu.org; Sat, 12 Jul 2025 04:43:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44776) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uaVpm-0004cp-Dl for 78925-done@debbugs.gnu.org; Sat, 12 Jul 2025 04:43:51 -0400 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 1uaVph-00041U-0B; Sat, 12 Jul 2025 04:43:45 -0400 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=8vFtEfh7mSmt1NknEPUN2VKUXuI8D9yWZ3KTx2X7at8=; b=YcGXT9chGDF6E+BrJiRI 00hhJdX/yChg7fJsWP9h7jHy9nvyH5PP+lKmqg28bkKALdzSwwOmHmhBlPk7ccXuvrJrXb2iP+lhf Ni3piNjHFSziX2y+dZdzAairHhxK+K7e5CeQrdhABklCfIxAeuHLqy2vZ6PmLrlKgrTGI5gaG+3H+ tD7QF+ohYBhpYqb9ePS33eKmf6Fg2RuD+X9rau68rxC8c/2XUgymtC4Y/WxW0uO8TVO3MBoaEGK8O hKDFLypFuPI8c5rE8V0p0NN1eKd8F2rLIlEaEiApYCl8SAiFhenP+VDeJBejHGx62aicHcKuvVjoP 51kHybJe+3az7A==; Date: Sat, 12 Jul 2025 11:43:40 +0300 Message-Id: <86tt3her43.fsf@gnu.org> From: Eli Zaretskii To: Liu Hui In-Reply-To: (message from Liu Hui on Mon, 7 Jul 2025 17:58:17 +0800) Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files References: <86ecv14c9o.fsf@gnu.org> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78925-done Cc: 78925-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Liu Hui > Date: Mon, 7 Jul 2025 17:58:17 +0800 > Cc: 78925@debbugs.gnu.org > > On Mon, Jun 30, 2025 at 8:58 PM Eli Zaretskii wrote: > > > > > From: Liu Hui > > > Date: Mon, 30 Jun 2025 17:54:31 +0800 > > > > > > When using ffap in remote files, I find the guess of filename at point > > > in the prompt, which is mainly determined by ffap-file-at-point, is > > > not suitable or at least inconsistent. > > > > > > Case 1: > > > > > > 1. emacs -Q > > > 2. Open a remote file: > > > C-x C-f /ssh:server:~/test_file > > > 3. type a filename that exists in localhost (e.g. /etc/hosts), and M-x ffap > > > > > > ffap finds the local file /etc/hosts instead of the remote one. The > > > reason is that ffap-file-at-point always checks the local file first. > > > ffap-file-at-point only tries to find remote file if there is no > > > existing local file. > > > > > > However, it is more reasonable to first check (or only check) remote > > > file and always prompt remote filename (i.e. /ssh:server:/etc/hosts) > > > in remote cases. > > > > I don't think I agree. However, perhaps a user option or a prefix > > argument could be used to control which behavior is preferred. > > The attached patch adds an option 'ffap-prefer-remote-file', which > defaults to nil. A non-nil value means ffap always finds remote files > for absolute filenames in remote case, instead of finding local files > first. Thanks, installed on master, and closing the bug. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 12 04:50:50 2025 Received: (at 78925-done) by debbugs.gnu.org; 12 Jul 2025 08:50:50 +0000 Received: from localhost ([127.0.0.1]:43755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uaVwX-00057B-Vr for submit@debbugs.gnu.org; Sat, 12 Jul 2025 04:50:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40020) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uaVwV-00056x-6x for 78925-done@debbugs.gnu.org; Sat, 12 Jul 2025 04:50:47 -0400 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 1uaVwO-000640-Sk; Sat, 12 Jul 2025 04:50:41 -0400 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=3ECaDd6hh/F/OAZ4HWTHFkvbanP2LXII2tUWVO+HTkI=; b=Gz0h+E/2/l9ohZZAvCU3 uPJavJeFLtWxNEJ1v7YXwz5eUtSCWU8PXKTQUUouYAZoOViC37x9cVrfoP6tqw+6SAjSbnYBA/Rur U3bBk2uL3Bbk19PZQJX3BttjVcLBWbPUt1HWlkUwV71Irl4m0Y3ITc35prcuBjuaX84MXDQiUuLs4 soYKKXR60j8OHiKorybMJmRzxtuBQbRmOdsL8fNk6kHvPeIhg4elnAjgxSUt+epm4U4kP/qaBwGAa ketdBcCYoC9fghHBC3dMKFPDvoZnrhVAsnXyyO3KVr0Z3W494oKlxUmqkMv2nCDpk/93JdyPXV1KC o8eD4rUH1uRUSg==; Date: Sat, 12 Jul 2025 11:49:53 +0300 Message-Id: <86sej1eqtq.fsf@gnu.org> From: Eli Zaretskii To: Liu Hui In-Reply-To: (message from Liu Hui on Tue, 8 Jul 2025 18:19:39 +0800) Subject: Re: bug#78925: 31.0.50; ffap's filename prompt problem in remote files, [PATCH] Add option 'ffap-prefer-remote-file' (bug#78925) References: <86ecv14c9o.fsf@gnu.org> <875xg3c44e.fsf_-_@gmx.de> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 78925-done Cc: 78925-done@debbugs.gnu.org, michael.albinus@gmx.de X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > From: Liu Hui > Date: Tue, 8 Jul 2025 18:19:39 +0800 > Cc: Eli Zaretskii , 78925@debbugs.gnu.org > > On Tue, Jul 8, 2025 at 1:17 AM Michael Albinus wrote: > > > > Liu Hui writes: > > > > Hi, > > > > > The attached patch adds an option 'ffap-prefer-remote-file', which > > > defaults to nil. A non-nil value means ffap always finds remote files > > > for absolute filenames in remote case, instead of finding local files > > > first. > > > > Thank you for the patch. I don't use ffap myself, so just some comments > > from cursory review. > > Thanks for your comments! > > > > +--- > > > +*** New user option 'ffap-prefer-remote-file'. > > > +If non-nil, ffap always finds remote files in buffers with remote > > > +'default-directory'. If nil, ffap finds local files first for absolute > > > +filenames in above buffers. The default is nil. > > > > Please spell it out FFAP. > > Done. > > > > -(defun ffap-file-exists-string (file &optional nomodify) > > > +(defun ffap-file-exists-string (file &optional nomodify remote-host) > > > > A remote file name is not only the host. There are also, at least, a > > method and a user. Please call this argument remote-prefix or alike. > > Renamed to remote-prefix. > > > > + ((or (not file) ; quietly reject nil > > > + (zerop (length file))) ; and also "" > > > + nil) > > > > aka ((zerop (length file)) nil) > > Done. > > > > + ((and remote-host ; prepend remote host to file > > > + (file-name-absolute-p file) > > > + (setq file (concat remote-host file)) > > > + nil)) > > > > What, if file is already remote? Shouldn't the check be > > > > --8<---------------cut here---------------start------------->8--- > > ((and remote-host ; prepend remote host to file > > (file-name-absolute-p file) > > (not (file-name-remote-p file)) > > (setq file (concat remote-host file)) > > nil)) > > --8<---------------cut here---------------end--------------->8--- > > I examined the callers (e.g. ffap-file-at-point) and they have ruled > out the possibility that file is remote by ffap-file-remote-p. So it > wasn't checked again here. The docstring has been revised to clarify > the usage of the new argument. > > > > (require 'cl-lib) > > > (require 'ert) > > > +(require 'tramp) > > > (require 'ert-x) > > > (require 'ffap) > > > > Why Tramp? I guess it isn't needed. > > The comment of ert-remote-temporary-file-directory: > > ;; If this defvar is used in a test file, `tramp' shall be loaded > ;; prior `ert-x'. There is no default value on w32 systems, which > ;; could work out of the box. > > Otherwise, the remote test is skipped with 'make test/ffap-tests'. > > > > + (let* ((ffap-prefer-remote-file t) > > > + (default-directory > > > + (expand-file-name ert-remote-temporary-file-directory)) > > > + (test-file (expand-file-name "ffap-test" default-directory))) > > > > I would use (make-temp-file "ffap-test") > > Done. Installed on master (after reverting the previous one). From unknown Sun Aug 10 16:51:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 09 Aug 2025 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator