emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Ferdinand Pieper <list_gnu@pie.tf>
To: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Cc: emacs-orgmode@gnu.org
Subject: Re: Additonal slashes in URI sent to org-protocol
Date: Sat, 09 May 2020 15:07:26 +0200	[thread overview]
Message-ID: <87eertw92p.fsf@pie.tf> (raw)
In-Reply-To: <87h7wtc1qy.fsf@nicolasgoaziou.fr>

[-- Attachment #1: Type: text/plain, Size: 841 bytes --]


thanks for your reply!

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> Please add the function modified in the commit message. Also, if 
> you haven't signed FSF papers for copyright, you need to insert 


>> -		       (new-style (string= (match-string 1 fname) 
>> "?")))  +		       (new-style (string-match 
>> (match-string 1 fname) "/*?"))) 
> I don't understand this line. Aren't you calling string-match 
> backwards?  I think you mean: 
>   (new-style (string-match "?" (match-string 1 fname))) 

Yes, you are right. I mixed this up because I just changed the 
previous line without thinking about it.

> Could you also insert a comment explaining why this workaround 
> is required? 

I added a short comment in the commit message. Did you mean to 
also insert a comment in the code?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-protocol-Allow-slashes-after-sub-protocol.patch --]
[-- Type: text/x-patch, Size: 1599 bytes --]

From ba0ce2837867dac20baa433b15c34cb9d4729e67 Mon Sep 17 00:00:00 2001
From: fpi <git@pie.tf>
Date: Fri, 3 Apr 2020 19:12:01 +0200
Subject: [PATCH] org-protocol: Allow slashes after sub-protocol

* lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Let
org-protocol handle URIs with additional slashes before the start of
the query string, e.g.


instead of


This is needed to support some browsers under windows which insert the
additional slash in the URI.

 lisp/org-protocol.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 55a534d0d..35e1bc2f8 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -617,13 +617,13 @@ CLIENT is ignored."
             (let ((proto
 		   (concat the-protocol
 			   (regexp-quote (plist-get (cdr prolist) :protocol))
-			   "\\(:/+\\|\\?\\)")))
+			   "\\(:/+\\|/*\\?\\)")))
               (when (string-match proto fname)
                 (let* ((func (plist-get (cdr prolist) :function))
                        (greedy (plist-get (cdr prolist) :greedy))
                        (split (split-string fname proto))
                        (result (if greedy restoffiles (cadr split)))
-		       (new-style (string= (match-string 1 fname) "?")))
+		       (new-style (string-match "/*?" (match-string 1 fname))))
                   (when (plist-get (cdr prolist) :kill-client)
 		    (message "Greedy org-protocol handler.  Killing client.")

  reply	other threads:[~2020-05-09 13:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-05 14:55 Additonal slashes in URI sent to org-protocol Ferdinand Pieper
2020-05-06  1:04 ` Nicolas Goaziou
2020-05-09 13:07   ` Ferdinand Pieper [this message]
2020-05-22 15:56     ` Bastien
  -- strict thread matches above, loose matches on Subject: below --
2020-04-05 13:56 Ferdinand Pieper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eertw92p.fsf@pie.tf \
    --to=list_gnu@pie.tf \
    --cc=emacs-orgmode@gnu.org \
    --cc=mail@nicolasgoaziou.fr \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).