Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

lisp/ob-gnuplot.el

@@ -184,7 +184,7 @@ This function is called by `org-babel-execute-src-block'."
   "Return list of gnuplot statements assigning the block's variables"
   (mapcar
    (lambda (pair) (format "%s = \"%s\"" (car pair) (cdr pair)))
-   (mapcar #'cdr (org-babel-get-header params :var))))
+   (org-babel-gnuplot-process-vars params)))
 
 (defvar gnuplot-buffer)
 (defun org-babel-gnuplot-initiate-session (&optional session params)

lisp/ob-latex.el

@@ -75,6 +75,7 @@ This function is called by `org-babel-execute-src-block'."
 	     (fit (or (cdr (assoc :fit params)) border))
 	     (height (and fit (cdr (assoc :pdfheight params))))
 	     (width (and fit (cdr (assoc :pdfwidth params))))
+	     (headers (cdr (assoc :headers params)))
 	     (in-buffer (not (string= "no" (cdr (assoc :buffer params)))))
 	     (org-export-latex-packages-alist
 	      (append (cdr (assoc :packages params))
@@ -102,6 +103,12 @@ This function is called by `org-babel-execute-src-block'."
 	     (if border (format "\\setlength{\\PreviewBorder}{%s}" border) "")
 	     (if height (concat "\n" (format "\\pdfpageheight %s" height)) "")
 	     (if width  (concat "\n" (format "\\pdfpagewidth %s" width))   "")
+	     (if headers
+		 (concat "\n"
+			 (if (listp headers)
+			     (mapconcat #'identity headers "\n")
+			   headers) "\n")
+	       "")
 	     (if org-format-latex-header-extra
 		 (concat "\n" org-format-latex-header-extra)
 	       "")