summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Berry <ccberry@ucsd.edu>2016-12-28 18:32:07 -0800
committerCharles Berry <ccberry@ucsd.edu>2016-12-28 18:35:59 -0800
commited0c8cb995329c05058739b98d68e879b1db7e95 (patch)
treeea0f4b85b221cba8fed959d7c1e8fc9200f15644
parenta3073a06f42d7097ff00c8f54b059fd6e0f92d3f (diff)
downloadorg-mode-ed0c8cb995329c05058739b98d68e879b1db7e95.tar.gz
org-babel-execute:R fix `:colnames yes' clash with `:results graphics'
* lisp/ob-R.el (org-babel-execute:R): The `:colnames' and `:rownames' header arguments are ignored if `:results graphics' is specified. Reported by: Kodi Arfer <kodi@arfer.net> Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/111072>
-rw-r--r--lisp/ob-R.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 2993b09..69bc419 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -159,10 +159,10 @@ This function is called by `org-babel-execute-src-block'."
(result-type (cdr (assq :result-type params)))
(session (org-babel-R-initiate-session
(cdr (assq :session params)) params))
- (colnames-p (cdr (assq :colnames params)))
- (rownames-p (cdr (assq :rownames params)))
(graphics-file (and (member "graphics" (assq :result-params params))
(org-babel-graphical-output-file params)))
+ (colnames-p (unless graphics-file (cdr (assq :colnames params))))
+ (rownames-p (unless graphics-file (cdr (assq :rownames params))))
(full-body
(let ((inside
(list (org-babel-expand-body:R body params graphics-file))))