summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2019-03-14 18:12:08 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2019-03-14 18:12:08 +0100
commit83fb091a62d3ac69c6107eb1e2dfd99068d81320 (patch)
tree2042163b13e5220859ea6687c222d2fb7c9b5b69
parenta2deb8ce7605cd1d7b3f843727092d14643d250b (diff)
parent0007df863d94fef911bf10c86cb35e7a08a0e519 (diff)
downloadorg-mode-83fb091a62d3ac69c6107eb1e2dfd99068d81320.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-lint.el9
-rw-r--r--testing/lisp/test-org-lint.el3
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 64167cd..5b959db 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -580,12 +580,13 @@ Use :header-args: instead"
(lambda (k)
(when (equal (org-element-property :key k) "SETUPFILE")
(let ((file (org-unbracket-string
- "\"" "\""
- (org-element-property :value k))))
- (and (not (file-remote-p file))
+ "\"" "\""
+ (org-element-property :value k))))
+ (and (not (org-file-url-p file))
+ (not (file-remote-p file))
(not (file-exists-p file))
(list (org-element-property :begin k)
- (format "Non-existent setup file \"%s\"" file))))))))
+ (format "Non-existent setup file %S" file))))))))
(defun org-lint-wrong-include-link-parameter (ast)
(org-element-map ast 'keyword
diff --git a/testing/lisp/test-org-lint.el b/testing/lisp/test-org-lint.el
index 587bc0b..ab8f674 100644
--- a/testing/lisp/test-org-lint.el
+++ b/testing/lisp/test-org-lint.el
@@ -240,6 +240,9 @@ This is not a node property
"Test `org-lint-non-existent-setupfile-parameter' checker."
(should
(org-test-with-temp-text "#+setupfile: Idonotexist.org"
+ (org-lint '(non-existent-setupfile-parameter))))
+ (should-not
+ (org-test-with-temp-text "#+setupfile: https://I.do/not.exist.org"
(org-lint '(non-existent-setupfile-parameter)))))
(ert-deftest test-org-lint/wrong-include-link-parameter ()