[elpa] externals/org 047fa8c 2/3: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 047fa8c319eb6a868438f0f114d77bc6fa754678
Merge: 3dbeb67 24a7ed5
Author: Bastien Guerry <bzg@gnu.org>
Commit: Bastien Guerry <bzg@gnu.org>

    Merge branch 'maint'
---
 lisp/org-protocol.el              | 2 +-
 testing/lisp/test-org-protocol.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 7e9f3b2..30f5bc0 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -631,7 +631,7 @@ CLIENT is ignored."
                        (greedy (plist-get (cdr prolist) :greedy))
                        (split (split-string fname proto))
                        (result (if greedy restoffiles (cadr split)))
-                      (new-style (string-match "/*?" (match-string 1 fname))))
+                      (new-style (not (= ?: (aref (match-string 1 fname) 0)))))
                   (when (plist-get (cdr prolist) :kill-client)
                    (message "Greedy org-protocol handler.  Killing client.")
                    (server-edit))
diff --git a/testing/lisp/test-org-protocol.el 
b/testing/lisp/test-org-protocol.el
index b9db8fd..d33052b 100644
--- a/testing/lisp/test-org-protocol.el
+++ b/testing/lisp/test-org-protocol.el
@@ -40,7 +40,7 @@
                      
"url=https%3A%2F%2Forgmode.org%2Forg.html%23capture-protocol&"
                      "title=The%20Org%20Manual&"
                      "body=9.4.2%20capture%20protocol"))
-        (data (org-protocol-parse-parameters url)))
+        (data (org-protocol-parse-parameters url t)))
     (should (string= (plist-get data :template) "p"))
     (should (string= (plist-get data :url) 
"https://orgmode.org/org.html#capture-protocol";))
     (should (string= (plist-get data :title) "The Org Manual"))