[elpa] externals/org f63bb5e 2/2: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit f63bb5eea803e8202f748a246b6d4a6fb9df4706
Merge: 0457d8d 7116914
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org-lint.el              | 8 ++++++--
 lisp/ox.el                    | 2 +-
 testing/lisp/test-org-lint.el | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index e8b4eb4..1380f782 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -671,7 +671,7 @@ Use \"export %s\" instead"
        (when (string= (org-element-property :key k) "OPTIONS")
          (let ((value (org-element-property :value k))
                (start 0))
-           (while (string-match "\\(.+?\\):\\((.*?)\\|\\S-*\\)[ \t]*"
+           (while (string-match "\\(.+?\\):\\((.*?)\\|\\S-+\\)?[ \t]*"
                                 value
                                 start)
              (setf start (match-end 0))
@@ -679,7 +679,11 @@ Use \"export %s\" instead"
                (unless (member item allowed)
                  (push (list (org-element-property :post-affiliated k)
                              (format "Unknown OPTIONS item \"%s\"" item))
-                       reports))))))))
+                       reports))
+                (unless (match-string 2 value)
+                  (push (list (org-element-property :post-affiliated k)
+                              (format "Missing value for option item %S" item))
+                        reports))))))))
     reports))
 
 (defun org-lint-invalid-macro-argument-and-template (ast)
diff --git a/lisp/ox.el b/lisp/ox.el
index f705bc8..ff1f2ea 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -1386,7 +1386,7 @@ e.g., `org-export-create-backend'.  It specifies which 
back-end
 specific items to read, if any."
   (let ((line
         (let ((s 0) alist)
-          (while (string-match "\\(.+?\\):\\((.*?)\\|\\S-*\\)[ \t]*" options s)
+          (while (string-match "\\(.+?\\):\\((.*?)\\|\\S-+\\)[ \t]*" options s)
             (setq s (match-end 0))
             (push (cons (match-string 1 options)
                         (read (match-string 2 options)))
diff --git a/testing/lisp/test-org-lint.el b/testing/lisp/test-org-lint.el
index 29bd942..800599e 100644
--- a/testing/lisp/test-org-lint.el
+++ b/testing/lisp/test-org-lint.el
@@ -313,6 +313,9 @@ This is not a node property
   "Test `org-lint-unknown-options-item' checker."
   (should
    (org-test-with-temp-text "#+options: foobarbaz:t"
+     (org-lint '(unknown-options-item))))
+  (should
+   (org-test-with-temp-text "#+options: H:"
      (org-lint '(unknown-options-item)))))
 
 (ert-deftest test-org-lint/invalid-macro-argument-and-template ()