summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-07 14:20:33 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-07 14:20:33 +0100
commitd435c75f543cce08b578a399c531a28c37a48b39 (patch)
treedcd13934551807d62805a12cc0ad59e1452d9b54
parent3695415199898f391b28c0ba85e5dd21424c10a0 (diff)
parent1187538a212112708993b44e6b814f1a70e9f6ce (diff)
downloadorg-mode-d435c75f543cce08b578a399c531a28c37a48b39.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ob-gnuplot.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index b0743f6..241f1d3 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -116,6 +116,8 @@ code."
(timefmt (cdr (assq :timefmt params)))
(time-ind (or (cdr (assq :timeind params))
(when timefmt 1)))
+ (directory (and (buffer-file-name)
+ (file-name-directory (buffer-file-name))))
(add-to-body (lambda (text) (setq body (concat text "\n" body)))))
;; append header argument settings to body
(when title (funcall add-to-body (format "set title '%s'" title)))
@@ -161,7 +163,10 @@ code."
(format "\\$%s" (car pair)) (cdr pair) body)))
vars)
(when prologue (funcall add-to-body prologue))
- (when epilogue (setq body (concat body "\n" epilogue))))
+ (when epilogue (setq body (concat body "\n" epilogue)))
+ ;; Setting the directory needs to be done first so that
+ ;; subsequent 'output' directive goes to the right place.
+ (when directory (funcall add-to-body (format "cd '%s'" directory))))
body))
(defun org-babel-execute:gnuplot (body params)