Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index ded825b1d01..6781fb30a3b 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/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))))