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.
This commit is contained in:
Dan Davison 2009-07-11 03:07:37 -04:00
parent ee749f4d70
commit f622d8d288
1 changed files with 2 additions and 2 deletions

View File

@ -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