diff -u /tmp/org-mode/lisp/ob-gnuplot.el /home/philip/Source/emacs/lisp/org/ob-gnuplot.el --- /tmp/org-mode/lisp/ob-gnuplot.el 2023-08-14 16:10:37.615919936 +0200 +++ /home/philip/Source/emacs/lisp/org/ob-gnuplot.el 2023-04-05 22:53:26.932222097 +0200 @@ -3,7 +3,7 @@ ;; Copyright (C) 2009-2023 Free Software Foundation, Inc. ;; Author: Eric Schulte -;; Maintainer: Ihor Radchenko +;; Maintainer: Ihor Radchenko ;; Keywords: literate programming, reproducible research ;; URL: https://orgmode.org @@ -40,9 +40,11 @@ ;;; Code: -(require 'ob-9.7 "ob") -(require 'org-macs-9.7 "org-macs") -(require 'ox-ascii-9.7 "ox-ascii") +(require 'org-macs) +(org-assert-version) + +(require 'ob) +(require 'org-macs) (declare-function org-time-string-to-time "org" (s)) (declare-function orgtbl-to-generic "org-table" (table params)) @@ -196,7 +198,7 @@ (defun org-babel-execute:gnuplot (body params) "Execute a block of Gnuplot code. This function is called by `org-babel-execute-src-block'." - (org-require-package 'gnuplot) + (require 'gnuplot) (let ((session (cdr (assq :session params))) (result-type (cdr (assq :results params))) (body (org-babel-expand-body:gnuplot body params)) @@ -260,7 +262,7 @@ If there is not a current inferior-process-buffer in SESSION then create one. Return the initialized session. The current `gnuplot-mode' doesn't provide support for multiple sessions." - (org-require-package 'gnuplot) + (require 'gnuplot) (unless (string= session "none") (save-window-excursion (gnuplot-send-string-to-gnuplot "" "line") @@ -293,33 +295,17 @@ (require 'ox-org) (with-temp-file data-file (insert (let ((org-babel-gnuplot-timestamp-fmt - (or (plist-get params :timefmt) "%Y-%m-%d-%H:%M:%S")) - ;; Create custom limited backend that will disable - ;; advanced ASCII export features that may alter the - ;; original data. - (ob-gnuplot-data - (org-export-create-backend - :parent 'ascii - :transcoders - `(;; Do not try to resolve links. Export them verbatim. - (link . (lambda (link _ _) (org-element-interpret-data link))) - ;; Drop emphasis markers from verbatim and code. - ;; This way, data can use verbatim when escaping - ;; is necessary and yet be readable by Gnuplot, - ;; which is not aware about Org's markup. - (verbatim . (lambda (verbatim _ _) (org-element-property :value verbatim))) - (code . (lambda (code _ _) (org-element-property :value code))))))) + (or (plist-get params :timefmt) "%Y-%m-%d-%H:%M:%S"))) (orgtbl-to-generic table (org-combine-plists - `( :sep "\t" :fmt org-babel-gnuplot-quote-tsv-field + '( :sep "\t" :fmt org-babel-gnuplot-quote-tsv-field ;; Two setting below are needed to make :fmt work. :raw t - :backend ,ob-gnuplot-data) + :backend ascii) params))))) data-file) (provide 'ob-gnuplot) -(provide 'ob-gnuplot-9.7) ;;; ob-gnuplot.el ends here Diff finished. Mon Aug 14 16:12:51 2023