From 7f3e64bfb4956ed88fb5ca613c44b8b6df922093 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Fri, 30 Apr 2010 14:14:13 -0400 Subject: [PATCH] babel: R: output colnames when other languages would --- contrib/babel/lisp/langs/org-babel-R.el | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/babel/lisp/langs/org-babel-R.el b/contrib/babel/lisp/langs/org-babel-R.el index 220e44c46..f05c2f843 100644 --- a/contrib/babel/lisp/langs/org-babel-R.el +++ b/contrib/babel/lisp/langs/org-babel-R.el @@ -63,11 +63,17 @@ called by `org-babel-execute-src-block'." (let* ((processed-params (org-babel-process-params params)) (result-type (fourth processed-params)) (session (org-babel-R-initiate-session (first processed-params) params)) - (colnames-p (equal "yes" (cdr (assoc :colnames params)))) - (rownames-p (equal "yes" (cdr (assoc :rownames params)))) + (colnames-p (cdr (assoc :colnames params))) + (rownames-p (cdr (assoc :rownames params))) (out-file (cdr (assoc :file params))) (full-body (org-babel-expand-body:R body params processed-params)) - (result (org-babel-R-evaluate session full-body result-type colnames-p rownames-p))) + (result + (org-babel-R-evaluate + session full-body result-type + (or (equal "yes" colnames-p) + (org-babel-pick-name (nth 4 processed-params) colnames-p)) + (or (equal "yes" rownames-p) + (org-babel-pick-name (nth 5 processed-params) rownames-p))))) (or out-file result)))) (defun org-babel-prep-session:R (session params)