[elpa] externals/org 25640ac: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 25640ace0f0120ecc8ca95b95ac2ecd38a74dc2a
Merge: 20ed794 413afbe
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'bugfix'
---
 lisp/ox.el               | 3 +++
 testing/lisp/test-org.el | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/ox.el b/lisp/ox.el
index 75881cf..98c9c11 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -1050,6 +1050,7 @@ BACKEND is a structure with `org-export-backend' type."
   (unless (org-export-backend-p backend)
     (error "Unknown \"%s\" back-end: Aborting export" backend)))
 
+;;;###autoload
 (defun org-export-derived-backend-p (backend &rest backends)
   "Non-nil if BACKEND is derived from one of BACKENDS.
 BACKEND is an export back-end, as returned by, e.g.,
@@ -1860,6 +1861,7 @@ INFO is a plist containing export directives."
       (let ((transcoder (cdr (assq type (plist-get info :translate-alist)))))
        (and (functionp transcoder) transcoder)))))
 
+;;;###autoload
 (defun org-export-data (data info)
   "Convert DATA into current back-end format.
 
@@ -4591,6 +4593,7 @@ objects of the same type."
 ;; `org-export-raw-string' builds a pseudo-object out of a string
 ;; that any export back-end returns as-is.
 
+;;;###autoload
 (defun org-export-raw-string (s)
   "Return a raw object containing string S.
 A raw string is exported as-is, with no additional processing
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 73e9afc..056ea7d8 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -7446,7 +7446,7 @@ CLOCK: [2012-03-29 Thu 10:00]--[2012-03-29 Thu 16:40] =>  
6:40"
   (should
    (string-match-p
     (rx "* TODO Read book
-SCHEDULED: <2021-06-16 Wed +1d>
+SCHEDULED: <2021-06-16 " (1+ (not space)) " +1d>
 :PROPERTIES:
 :LAST_REPEAT:" (1+ nonl) "
 :END: