On Wednesday, 6 Dec 2017 at 23:20, Nicolas Goaziou wrote: > Hello, > > Eric S Fraga <esfli...@gmail.com> writes: > >> attached is a patch (relative to master from a few minutes ago) which >> allows gnuplot babel blocks to send the output to the right >> directory. I have tested this with both buffers associated with actual >> files and buffers not associated with any file. > > Thank you. Shouldn't it go in maint?
I have no idea what the protocol here is. But, in any case, attached is a new patch relative to maint. > >> + ;; setting the directory needs to be done first so that >> + ;; subsequent 'output' directive goes to the right place > > Nitpick: I hate upper case (an RSI thing... ;-)) but okay. also noting that the previous comment started with lower case. and should single sentence comments end with a full stop (.)? Thanks, eric -- Eric S Fraga via Emacs 27.0.50, Org release_9.1.4-200-g15df8d
From 6857093df26af908d85dfb1e9512f1a838b2ffd7 Mon Sep 17 00:00:00 2001
From: Eric S Fraga <e.fr...@ucl.ac.uk>
Date: Thu, 7 Dec 2017 06:56:41 +0000
Subject: [PATCH] allow gnuplot to generate plots in different directories
* lisp/ob-gnuplot.el (org-babel-expand-body:gnuplot) if the org buffer
is associated with a file, direct gnuplot to change to the directory
for that file.
---
lisp/ob-gnuplot.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index b0743f604..241f1d3a4 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)
--
2.15.0
signature.asc
Description: PGP signature
