From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Visuwesh Newsgroups: gmane.emacs.bugs Subject: bug#67688: 30.0.50; ffap prepends buffers default-directory to guessed file name in case of tramp's file name syntax Date: Sat, 16 Dec 2023 20:15:48 +0530 Message-ID: <877clexl2b.fsf@gmail.com> References: <87r0jy3z41.fsf@no.lan> <87fs0cg3rr.fsf@gmx.de> <871qbrtqtc.fsf@gmail.com> <87wmtjsbfj.fsf@gmail.com> <83jzpjtppg.fsf@gnu.org> <87plzbs9vl.fsf@gmail.com> <83il4ymhmr.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17884"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: michael.albinus@gmx.de, grfz@gmx.de, 67688@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 16 15:47:32 2023 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 1rEVwx-0004TZ-Lm for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 16 Dec 2023 15:47:31 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rEVwY-0005nP-PX; Sat, 16 Dec 2023 09:47:06 -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 1rEVwV-0005mm-AA for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2023 09:47: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 1rEVwU-0007DQ-BI for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2023 09:47:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rEVwU-0005jl-K2 for bug-gnu-emacs@gnu.org; Sat, 16 Dec 2023 09:47:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Visuwesh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 Dec 2023 14:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67688 X-GNU-PR-Package: emacs Original-Received: via spool by 67688-submit@debbugs.gnu.org id=B67688.170273796321153 (code B ref 67688); Sat, 16 Dec 2023 14:47:02 +0000 Original-Received: (at 67688) by debbugs.gnu.org; 16 Dec 2023 14:46:03 +0000 Original-Received: from localhost ([127.0.0.1]:54274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEVvW-0005Tv-95 for submit@debbugs.gnu.org; Sat, 16 Dec 2023 09:46:02 -0500 Original-Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:58476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rEVvT-0005Fa-6D for 67688@debbugs.gnu.org; Sat, 16 Dec 2023 09:46:01 -0500 Original-Received: by mail-pl1-x641.google.com with SMTP id d9443c01a7336-1d38bedd799so12212875ad.0 for <67688@debbugs.gnu.org>; Sat, 16 Dec 2023 06:45:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702737952; x=1703342752; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=v5N2zLTIewb6ueNiY34W5Uy3FfHlwBp2qbJm1tfcraU=; b=TPLL9RlrLxEZy4lp1J+nzhXH4efK6p/1nbkTQMNrsfVSapV3SCrdWOYnuwJGcrnEY/ 7XpcdmKW3nl8O7j6kTupNdkT8tPbGY5cPnOMxW1TKDN+RZSR7QR5agrg3/KoznpwULt1 mjiXVuWKpWdV/WWVo3dkcX94XPPubAFpJ3ojYvc6l87fM4ZN9osPKemoDPAQBVuT6PhZ R2VrjA7kKjE+RrU52ZRfMQJBJLSlpYyc5eVrcIXr9Lr0w6eDVuDXgXCePFfta8YXL8BJ Y5zlhAf3/sV6e+056TIURnp2clFfJPL04KrBmACWnBG0mF0hbcAmYT8jbLfSBRFAHADW t+hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702737952; x=1703342752; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=v5N2zLTIewb6ueNiY34W5Uy3FfHlwBp2qbJm1tfcraU=; b=owv45B6GuqPLxNU8rBLJTiG7vD7MF+xzJEg9YKH21YA/M8Hr+s5uRKMZqkLYbrSjiQ vjveoYjrEnEStZb/kZ+Wbjou9aJI0zuxkZ2oxosg9Ou9EI5BSnOYm9SlSBGM2v/CUf6k IFykgJ6IGoLUI0QgappNU/k1OnguDufoqX14Yk3oHlnY6lVaga6B1M5xuqQi9FXMDCZJ 9J8R6xCJhQBjYywWNPR5i8sA9tHq8BYteVn7sZRIfhc65GvRqjT0RE6tn+mBfFHa2ulY pvFrpf+e63D33Zp2ATv/gqceYHUL9C2SE/htlfZ4RRX64gHriHgU5O8BUcASkMWk1zDr pQfw== X-Gm-Message-State: AOJu0YxmFb9WaTQbE5XCXx45UTJBSQyxQPGUsWbnbdU7zZL8wHYPN7Jx xYop77vcvbnkRyqgxIoq+MU= X-Google-Smtp-Source: AGHT+IEjvXPO2IMRZBYQcpcBEEKtUcZzrNPBAkqRUUkuMcO8n3pJ3NMAv8ZG9k8owDGbm1EO8wc/Rg== X-Received: by 2002:a17:903:24a:b0:1d0:68a:4a45 with SMTP id j10-20020a170903024a00b001d0068a4a45mr18357806plh.35.1702737952483; Sat, 16 Dec 2023 06:45:52 -0800 (PST) Original-Received: from localhost ([49.204.142.139]) by smtp.gmail.com with ESMTPSA id jw22-20020a170903279600b001cfc01a265fsm16062289plb.170.2023.12.16.06.45.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 06:45:51 -0800 (PST) In-Reply-To: <83il4ymhmr.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Dec 2023 14:55:24 +0200") 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:276345 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable [=E0=AE=9A=E0=AE=A9=E0=AE=BF =E0=AE=9F=E0=AE=BF=E0=AE=9A=E0=AE=AE=E0=AF=8D= =E0=AE=AA=E0=AE=B0=E0=AF=8D 16, 2023] Eli Zaretskii wrote: >> From: Visuwesh >> Cc: michael.albinus@gmx.de, grfz@gmx.de, 67688@debbugs.gnu.org >> Date: Tue, 12 Dec 2023 21:15:02 +0530 >>=20 >> [Tuesday December 12, 2023] Eli Zaretskii wrote: >>=20 >> >> Cc: grfz@gmx.de, 67688@debbugs.gnu.org >> >> From: Visuwesh >> >> Date: Tue, 12 Dec 2023 20:41:28 +0530 >> >>=20 >> >> -(defcustom ffap-lax-url t >> >> +(defcustom ffap-lax-url nil >> > >> > This change of the default requires a NEWS entry. >> > >> > Thanks. >>=20 >> I was waiting for review from others. Nevertheless, I have attached a >> proper patch. > > Thanks. Let's wait a bit longer, but meanwhile, a nit: > >> --- a/etc/NEWS >> +++ b/etc/NEWS >> @@ -258,6 +258,11 @@ called in the '--eval' expression, which is useful = when those >> arguments contain arbitrary characters that otherwise might require >> elaborate and error-prone escaping (to protect them from the shell). >>=20=20 >> +--- >> +** ffap-lax-url now defaults to nil. >> +Previously, it was set to ffap-lax-url to t but this broke remote file >> +name detection. > > Please quote symbols in NEWS 'like this'. Oops, fixed in attached patch. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Make-ffap-correctly-guess-remote-file-names-at-point.patch >From 7769b62cd23bf3eb879c34e0c78ed7f367791993 Mon Sep 17 00:00:00 2001 From: Visuwesh Date: Tue, 12 Dec 2023 21:14:12 +0530 Subject: [PATCH] Make ffap correctly guess remote file names at point * lisp/ffap.el (ffap-lax-url): Set it to nil so that remote file names may be matched. (bug#67688) (ffap-fixup-email): New function. (ffap-guesser): Specially handle email addresses now that ffap-lax-url is nil as user@host fails to be matched as an email address with that setting. * etc/NEWS: Announce the new value of the defcustom. --- etc/NEWS | 5 +++++ lisp/ffap.el | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 29f4e5c0b66..3e527fcd2ad 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -258,6 +258,11 @@ called in the '--eval' expression, which is useful when those arguments contain arbitrary characters that otherwise might require elaborate and error-prone escaping (to protect them from the shell). +--- +** 'ffap-lax-url' now defaults to nil. +Previously, it was set to 'ffap-lax-url' to t but this broke remote file +name detection. + * Editing Changes in Emacs 30.1 diff --git a/lisp/ffap.el b/lisp/ffap.el index 530e3da182e..9cea11cf540 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -152,15 +152,15 @@ ffap-url-unwrap-remote :group 'ffap :version "24.3") -(defcustom ffap-lax-url t +(defcustom ffap-lax-url nil "If non-nil, allow lax URL matching. The default non-nil value might produce false URLs in C++ code with symbols like \"std::find\". On the other hand, setting this to nil will disable recognition of URLs that are not -well-formed, such as \"user@host\" or \"\"." +well-formed." :type 'boolean :group 'ffap - :version "25.2") ; nil -> t + :version "30.1") (defcustom ffap-ftp-default-user "anonymous" "User name in FTP file names generated by `ffap-host-to-filename'. @@ -609,6 +609,13 @@ ffap-fixup-url ((and ffap-url-unwrap-remote (ffap-url-unwrap-remote url))) (url))) +(defun ffap-fixup-email (email) + "Clean up EMAIL and return it as a mailto: URL." + (when (stringp email) + (if (string-prefix-p "mailto:" email) + email + (concat "mailto:" email)))) + ;;; File Name Handling: @@ -1571,6 +1578,7 @@ ffap-guesser (ffap-fixup-url (or (ffap-url-at-point) (ffap-gopher-at-point)))) (ffap-file-at-point) ; may yield url! + (ffap-fixup-email (thing-at-point 'email)) (ffap-fixup-machine (ffap-machine-at-point)))) (defun ffap-prompter (&optional guess suffix) -- 2.42.0 --=-=-=--