summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-09-19 00:56:34 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-09-19 00:56:34 +0200
commit19113219ba4ead8989bc6ead8c44b2629405d843 (patch)
tree855816d25b250b38a8de6403f5b01e145998ed75
parent8f39d832df4f77ecb8bcd30fa21bfdb502572a61 (diff)
downloadorg-mode-19113219ba4ead8989bc6ead8c44b2629405d843.tar.gz
org-lint: Fix Babel header arg value checker
* lisp/org-lint.el (org-lint-wrong-header-value): Do not merge in default values for header arguments, since we are only checking those defined in the buffer.
-rw-r--r--lisp/org-lint.el45
1 files changed, 16 insertions, 29 deletions
diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index cfdf5df..b8d88ec 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -954,35 +954,22 @@ Use \"export %s\" instead"
(and (boundp v) (symbol-value v))))
org-babel-common-header-args-w-values))
(datum-header-values
- (apply
- #'org-babel-merge-params
- org-babel-default-header-args
- (and language
- (let ((v (intern (concat "org-babel-default-header-args:"
- language))))
- (and (boundp v) (symbol-value v))))
- (append
- (list (and (memq type '(babel-call inline-babel-call))
- org-babel-default-lob-header-args))
- (progn (goto-char (org-element-property :begin datum))
- (org-babel-params-from-properties language))
- (list
- (org-babel-parse-header-arguments
- (org-trim
- (pcase type
- (`src-block
- (mapconcat
- #'identity
- (cons (org-element-property :parameters datum)
- (org-element-property :header datum))
- " "))
- (`inline-src-block
- (or (org-element-property :parameters datum) ""))
- (_
- (concat
- (org-element-property :inside-header datum)
- " "
- (org-element-property :end-header datum)))))))))))
+ (org-babel-parse-header-arguments
+ (org-trim
+ (pcase type
+ (`src-block
+ (mapconcat
+ #'identity
+ (cons (org-element-property :parameters datum)
+ (org-element-property :header datum))
+ " "))
+ (`inline-src-block
+ (or (org-element-property :parameters datum) ""))
+ (_
+ (concat
+ (org-element-property :inside-header datum)
+ " "
+ (org-element-property :end-header datum))))))))
(dolist (header datum-header-values)
(let ((allowed-values
(cdr (assoc-string (substring (symbol-name (car header)) 1)