summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2014-03-25 18:59:25 +0100
committerAchim Gratz <Stromeko@Stromeko.DE>2014-03-25 18:59:25 +0100
commit078329f8132fec9498f8aa92b319f581f5f905cb (patch)
treec1add4b428d31895dd37bd7768155a7740346927
parentcd9685cd1075dbc8848095dab0147c5607e81c7b (diff)
parente89adba685dfe6dad4e67438930945fec8d311a3 (diff)
downloadorg-mode-078329f8132fec9498f8aa92b319f581f5f905cb.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-gnuplot.el13
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 6783706..7d7db2a 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -85,10 +85,15 @@ code."
(lambda (pair)
(cons
(car pair) ;; variable name
- (if (listp (cdr pair)) ;; variable value
- (org-babel-gnuplot-table-to-data
- (cdr pair) (org-babel-temp-file "gnuplot-") params)
- (cdr pair))))
+ (let* ((val (cdr pair)) ;; variable value
+ (lp (listp val)))
+ (if lp
+ (org-babel-gnuplot-table-to-data
+ (let* ((first (car val))
+ (tablep (or (listp first) (symbolp first))))
+ (if tablep val (mapcar 'list val)))
+ (org-babel-temp-file "gnuplot-") params)
+ val))))
(mapcar #'cdr (org-babel-get-header params :var)))))
(defun org-babel-expand-body:gnuplot (body params)