mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-18 11:10:00 +00:00
better parsing of argument headers
This commit is contained in:
parent
112c7d9236
commit
a902b62c29
|
@ -159,7 +159,7 @@ the header arguments specified at the source code block."
|
||||||
(params (org-combine-plists params (third info)))
|
(params (org-combine-plists params (third info)))
|
||||||
(cmd (intern (concat "org-babel-execute:" lang)))
|
(cmd (intern (concat "org-babel-execute:" lang)))
|
||||||
result)
|
result)
|
||||||
;; (message (format "params=%S" params)) ;; debugging statement
|
;; (message "params=%S" params) ;; debugging statement
|
||||||
(unless (member lang org-babel-interpreters)
|
(unless (member lang org-babel-interpreters)
|
||||||
(error "Language is not in `org-babel-interpreters': %s" lang))
|
(error "Language is not in `org-babel-interpreters': %s" lang))
|
||||||
(setq result (funcall cmd body params))
|
(setq result (funcall cmd body params))
|
||||||
|
@ -236,8 +236,9 @@ of the following form. (language body header-arguments-alist)"
|
||||||
"Parse a string of header arguments returning an alist."
|
"Parse a string of header arguments returning an alist."
|
||||||
(delq nil
|
(delq nil
|
||||||
(mapcar
|
(mapcar
|
||||||
(lambda (arg) (if (string-match "\\([^ \f\t\n\r\v]+\\)[ \f\t\n\r\v]*\\([^ \f\t\n\r\v]+.*\\)" arg)
|
(lambda (arg) (if (string-match "\\([^ \f\t\n\r\v]+\\)[ \f\t\n\r\v]+\\([^ \f\t\n\r\v]+.*\\)" arg)
|
||||||
(cons (intern (concat ":" (match-string 1 arg))) (org-babel-chomp (match-string 2 arg)))))
|
(cons (intern (concat ":" (match-string 1 arg))) (org-babel-chomp (match-string 2 arg)))
|
||||||
|
(cons (intern (concat ":" arg)) nil)))
|
||||||
(split-string (concat " " arg-string) "[ \f\t\n\r\v]+:" t))))
|
(split-string (concat " " arg-string) "[ \f\t\n\r\v]+:" t))))
|
||||||
|
|
||||||
(defun org-babel-where-is-src-block-head ()
|
(defun org-babel-where-is-src-block-head ()
|
||||||
|
|
Loading…
Reference in a new issue