Merge Org 8.2.6-1.

The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.

1 files changed, 9 insertions, 4 deletions

diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 8767e88e4c3..ffe5dcf59df 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/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)