diff options
author | Eric Schulte <schulte.eric@gmail.com> | 2011-09-08 11:33:04 -0600 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2011-09-08 11:44:49 -0600 |
commit | a4e881207d476c2366e48410cb8d2e5ce5824a18 (patch) | |
tree | 07cec16903ed2797eebb6d02af3fbdc7a10ed374 | |
parent | be69dd2d50e7d7aa5c93af1f2d7a0872e3244a51 (diff) | |
download | org-mode-a4e881207d476c2366e48410cb8d2e5ce5824a18.tar.gz |
better error message for unassigned variables
* lisp/ob.el (org-babel-merge-params): Better error message for
unassigned variables.
-rw-r--r-- | lisp/ob.el | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -1843,12 +1843,16 @@ parameters when merging lists." vars)) vars) (list (cons name pair)))) - ;; if no name is given, then assign to variables in order - (prog1 (setf (cddr (nth variable-index vars)) - (concat (symbol-name - (car (nth variable-index vars))) - "=" (cdr pair))) - (incf variable-index))))) + ;; if no name is given and we already have named variables + ;; then assign to named variables in order + (if (and vars (nth variable-index vars)) + (prog1 (setf (cddr (nth variable-index vars)) + (concat (symbol-name + (car (nth variable-index vars))) + "=" (cdr pair))) + (incf variable-index)) + (error "variable \"%s\" must be assigned a default value" + (cdr pair)))))) (:results (setq results (e-merge results-exclusive-groups results |