From 8b1ed7fb3cc418bb90fe48d3c4c8cb711decfded Mon Sep 17 00:00:00 2001 From: TEC Date: Thu, 30 Jul 2020 18:25:19 +0800 Subject: [PATCH 09/11] org-plot.el: fix logic error in transposition * lisp/org-plot.el (org-plot/gnuplot): If statement in transposition treated condition as its negative, to fix this the condition was inverted. It was also noticed that the code could not operate as expected as the user-supplied #+plot options were not fetched. Resolved by re-inserting relevant code from an older version of org-plot. --- lisp/org-plot.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/org-plot.el b/lisp/org-plot.el index fd92a12a1..1b227d698 100644 --- a/lisp/org-plot.el +++ b/lisp/org-plot.el @@ -579,6 +579,10 @@ line directly before or after the table." (dolist (pair org-plot/gnuplot-default-options) (unless (plist-member params (car pair)) (setf params (plist-put params (car pair) (cdr pair))))) + ;; Collect options. + (save-excursion (while (and (equal 0 (forward-line -1)) + (looking-at "[[:space:]]*#\\+")) + (setf params (org-plot/collect-options params)))) ;; collect table and table information (let* ((data-file (make-temp-file "org-plot")) (table (let ((tbl (org-table-to-lisp))) @@ -586,7 +590,7 @@ line directly before or after the table." ('y t) ('yes t) ('t t)) - (if (memq 'hline tbl) + (if (not (memq 'hline tbl)) (setq tbl (apply #'cl-mapcar #'list tbl)) ;; When present, remove hlines as they can't (currentily) be easily transposed. (setq tbl (apply #'cl-mapcar #'list -- 2.28.0