Browse Source

better error message for unassigned variables

* lisp/ob.el (org-babel-merge-params): Better error message for
  unassigned variables.
Eric Schulte 13 years ago
parent
commit
a4e881207d
1 changed files with 10 additions and 6 deletions
  1. 10 6
      lisp/ob.el

+ 10 - 6
lisp/ob.el

@@ -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
-		   (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
 	      (:results
 	       (setq results (e-merge results-exclusive-groups
 	       (setq results (e-merge results-exclusive-groups
 				      results
 				      results