[elpa] externals/org 6d1c1721e3 2/2: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 6d1c1721e36944dd6dd2adb4e5b395e576c22304
Merge: d6117f895c 4279b84a1f
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    Merge branch 'bugfix'
---
 lisp/org-lint.el     |  7 +++++--
 lisp/org-protocol.el | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 5b20e6c52a..44ea717d74 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -1406,8 +1406,11 @@ Use \"export %s\" instead"
                   (`(,(and (pred symbolp) name)
                      ,(pred string-or-null-p)
                      ,(pred string-or-null-p))
-                   (unless (org-cite-get-processor name)
-                     (list source "Unknown cite export processor %S" name)))
+                   (unless (or (org-cite-get-processor name)
+                               (progn
+                                 (org-cite-try-load-processor name)
+                                 (org-cite-get-processor name)))
+                     (list source (format "Unknown cite export processor %S" 
name))))
                   (_
                    (list source "Invalid cite export processor declaration")))
               (error
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 3f4a7053e8..171a1e472d 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -34,7 +34,10 @@
 ;; `org-protocol-protocol-alist' and `org-protocol-protocol-alist-default'.
 ;;
 ;; Any application that supports calling external programs with an URL
-;; as argument may be used with this functionality.
+;; as argument could use this functionality.  For example, you can
+;; configure bookmarks in your web browser to send a link to the
+;; current page to Org and create a note from it using `org-capture'.
+;; See Info node `(org) Protocols' for more information.
 ;;
 ;;
 ;; Usage:
@@ -44,13 +47,13 @@
 ;;
 ;;       (require 'org-protocol)
 ;;
-;;   3.) Ensure emacs-server is up and running.
-;;   4.) Try this from the command line (adjust the URL as needed):
+;;   2.) Ensure emacs-server is up and running.
+;;   3.) Try this from the command line (adjust the URL as needed):
 ;;
 ;;       $ emacsclient \
 ;;         
"org-protocol://store-link?url=http:%2F%2Flocalhost%2Findex.html&title=The%20title"
 ;;
-;;   5.) Optionally add custom sub-protocols and handlers:
+;;   4.) Optionally, add custom sub-protocols and handlers:
 ;;
 ;;       (setq org-protocol-protocol-alist
 ;;             '(("my-protocol"
@@ -64,10 +67,11 @@
 ;; If it works, you can now setup other applications for using this feature.
 ;;
 ;;
-;; As of March 2009 Firefox users follow the steps documented on
-;; https://kb.mozillazine.org/Register_protocol, Opera setup is described here:
-;; http://www.opera.com/support/kb/view/535/
+;; Firefox users follow the steps documented on
+;; https://kb.mozillazine.org/Register_protocol, Opera setup is
+;; described here: http://www.opera.com/support/kb/view/535/
 ;;
+;; See also: https://orgmode.org/worg/org-contrib/org-protocol.html
 ;;
 ;; Documentation
 ;; -------------
@@ -123,9 +127,6 @@
 ;; Note that using double slashes is optional from org-protocol.el's point of
 ;; view because emacsclient squashes the slashes to one.
 ;;
-;;
-;; provides: 'org-protocol
-;;
 ;;; Code:
 
 (require 'org-macs)