Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 6 insertions, 5 deletions

diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index b52c7591ad2..b4cf360730d 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -193,7 +193,8 @@ This function is called by `org-babel-execute-src-block'."
     (org-babel-comint-in-buffer session
       (mapc (lambda (var)
               (end-of-line 1) (insert var) (comint-send-input nil t)
-              (org-babel-comint-wait-for-output session)) var-lines))
+              (org-babel-comint-wait-for-output session))
+            var-lines))
     session))
 
 (defun org-babel-load-session:R (session body params)
@@ -360,7 +361,7 @@ Each member of this list is a list with three members:
             )
     }
 }(object=%s,transfer.file=\"%s\")"
-  "A template for an R command to evaluate a block of code and write the result to a file.
+  "Template for an R command to evaluate a block of code and write result to file.
 
 Has four %s escapes to be filled in:
 1. Row names, \"TRUE\" or \"FALSE\"
@@ -459,11 +460,11 @@ last statement in BODY, as elisp."
   "R-specific processing of return value.
 Insert hline if column names in output have been requested."
   (if column-names-p
-      (cons (car result) (cons 'hline (cdr result)))
+      (condition-case nil
+          (cons (car result) (cons 'hline (cdr result)))
+        (error "Could not parse R result"))
     result))
 
 (provide 'ob-R)
 
-
-
 ;;; ob-R.el ends here