mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 12:16:27 +00:00
Code Releases Activity

two more quick fixes

Browse source 
* lisp/ob.el (org-babel-balanced-split): Balance both [] and ()
  groupings.
  (org-babel-parse-header-arguments): Be sure to replace removed ":"
  characters.
This commit is contained in:
Eric Schulte 2011-10-21 11:35:41 -06:00
parent 0bcb248ee6
commit 93bdeb9212
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ob.el
View file

@ -1121,10 +1121,10 @@ instances of \"[ \t]:\" set ALTS to '((32 9) . 58)."
(and (matches ch (cdr alts)) (and (matches ch (cdr alts))
(matches last (car alts))))) (matches last (car alts)))))
(let ((balance 0) (partial nil) (lst nil) (last 0)) (let ((balance 0) (partial nil) (lst nil) (last 0))
(mapc (lambda (ch) ; split on [] balanced instances of [ \t]: (mapc (lambda (ch) ; split on [] or () balanced instances of [ \t]:
(setq balance (+ balance (setq balance (+ balance
(cond ((equal 91 ch) 1) (cond ((or (equal 91 ch) (equal 40 ch)) 1)
((equal 93 ch) -1) ((or (equal 93 ch) (equal 41 ch)) -1)
(t 0)))) (t 0))))
(setq partial (cons ch partial)) (setq partial (cons ch partial))
(when (and (= balance 0) (matched ch last)) (when (and (= balance 0) (matched ch last))
@ -1148,7 +1148,9 @@ instances of \"[ \t]:\" set ALTS to '((32 9) . 58)."
(cons (intern (match-string 1 arg)) (cons (intern (match-string 1 arg))
(org-babel-read (org-babel-chomp (match-string 2 arg)))) (org-babel-read (org-babel-chomp (match-string 2 arg))))
(cons (intern (org-babel-chomp arg)) nil))) (cons (intern (org-babel-chomp arg)) nil)))
(org-babel-balanced-split arg-string '((32 9) . 58))))))) ((lambda (raw)
(cons (car raw) (mapcar (lambda (r) (concat ":" r)) (cdr raw))))
(org-babel-balanced-split arg-string '((32 9) . 58))))))))
(defun org-babel-parse-multiple-vars (header-arguments) (defun org-babel-parse-multiple-vars (header-arguments)
"Expand multiple variable assignments behind a single :var keyword. "Expand multiple variable assignments behind a single :var keyword.