ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Carsten Dominik 2011-04-06 09:24:56 +02:00
parent 8a831e8f6c 7021f70f02
commit 1df06e0fa9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ob.el
View File

@ -996,8 +996,10 @@ may be specified in the current buffer."
(append
(mapcar (lambda (var) (cons :var var)) (car vars-and-names))
(list
(cons :colname-names (cadr vars-and-names))
(cons :rowname-names (caddr vars-and-names))
(cons :colname-names (or (cdr (assoc :colname-names params))
(cadr vars-and-names)))
(cons :rowname-names (or (cdr (assoc :rowname-names params))
(caddr vars-and-names)))
(cons :result-params result-params)
(cons :result-type (cond ((member "output" result-params) 'output)
((member "value" result-params) 'value)