Browse Source

Bugfix: In org-babel-merge-params.

Using symbol instead of string so that assq-delete-all works. This
will break if a variable has a name that is not a valid elisp symbol
-- unlikely? Possible? Also, fixing the argument parsing regexp, which
had been very lazily written.
Dan Davison 16 years ago
parent
commit
f622d8d288
1 changed files with 2 additions and 2 deletions
  1. 2 2
      lisp/org-babel.el

+ 2 - 2
lisp/org-babel.el

@@ -504,9 +504,9 @@ parameters when merging lists."
                     (case (car pair)
                       (:var
                        ;; we want only one specification per variable
-		       (when (string-match "\\(.+\\)=\\(.+\\)" (cdr pair))
+		       (when (string-match "\\([^= \f\t\n\r\v]+\\)=\\([^ \f\t\n\r\v]+\\)" (cdr pair))
 			 ;; TODO: When is this not true? Can there be whitespace around the '='?
-			 (setq var (match-string 1 (cdr pair))
+			 (setq var (intern (match-string 1 (cdr pair)))
 			       ref (match-string 2 (cdr pair))
 			       vars (cons (cons var ref) (assq-delete-all var vars)))))
 		      (:results