ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-03-14 18:12:08 +01:00
parent a2deb8ce76 0007df863d
commit 83fb091a62
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-lint.el
View File

@ -580,12 +580,13 @@ Use :header-args: instead"
(lambda (k) (lambda (k)
(when (equal (org-element-property :key k) "SETUPFILE") (when (equal (org-element-property :key k) "SETUPFILE")
(let ((file (org-unbracket-string (let ((file (org-unbracket-string
"\"" "\"" "\"" "\""
(org-element-property :value k)))) (org-element-property :value k))))
(and (not (file-remote-p file)) (and (not (org-file-url-p file))
(not (file-remote-p file))
(not (file-exists-p file)) (not (file-exists-p file))
(list (org-element-property :begin k) (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) (defun org-lint-wrong-include-link-parameter (ast)
(org-element-map ast 'keyword (org-element-map ast 'keyword

3
testing/lisp/test-org-lint.el
View File

@ -240,6 +240,9 @@ This is not a node property
"Test `org-lint-non-existent-setupfile-parameter' checker." "Test `org-lint-non-existent-setupfile-parameter' checker."
(should (should
(org-test-with-temp-text "#+setupfile: Idonotexist.org" (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))))) (org-lint '(non-existent-setupfile-parameter)))))
(ert-deftest test-org-lint/wrong-include-link-parameter () (ert-deftest test-org-lint/wrong-include-link-parameter ()