0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 13:46:27 +00:00

better error message for unassigned variables

* lisp/ob.el (org-babel-merge-params): Better error message for
  unassigned variables.
This commit is contained in:
Eric Schulte 2011-09-08 11:33:04 -06:00
parent be69dd2d50
commit a4e881207d

View file

@ -1843,12 +1843,16 @@ parameters when merging lists."
vars)) vars))
vars) vars)
(list (cons name pair)))) (list (cons name pair))))
;; if no name is given, then assign to variables in order ;; if no name is given and we already have named variables
(prog1 (setf (cddr (nth variable-index vars)) ;; then assign to named variables in order
(concat (symbol-name (if (and vars (nth variable-index vars))
(car (nth variable-index vars))) (prog1 (setf (cddr (nth variable-index vars))
"=" (cdr pair))) (concat (symbol-name
(incf variable-index))))) (car (nth variable-index vars)))
"=" (cdr pair)))
(incf variable-index))
(error "variable \"%s\" must be assigned a default value"
(cdr pair))))))
(:results (:results
(setq results (e-merge results-exclusive-groups (setq results (e-merge results-exclusive-groups
results results