merging change to message in error handling

IPython/extensions/rmagic.py

@@ -140,9 +140,9 b' class RMagics(Magics):'
         try:
             value = ri.baseenv['eval'](ri.parse(line))
         except (ri.RRuntimeError, ValueError) as exception:
-            self.flush() # otherwise next return seems to have copy of error
-            raise RMagicError(unicode_to_str('parsing and evaluating line "%s". R error message: "%s"\n' %
-                                             (line, str_to_unicode(exception.message, 'utf-8'))))
+            warning_or_other_msg = self.flush() # otherwise next return seems to have copy of error
+            raise RMagicError(unicode_to_str('parsing and evaluating line "%s".\nR error message: "%s"\n R stdout:"%s"\n' %
+                                             (line, str_to_unicode(exception.message, 'utf-8'), warning_or_other_msg)))
         text_output = self.flush()
         ri.set_writeconsole(old_writeconsole)
         return text_output, value

docs/examples/notebooks/rmagic_extension.ipynb

@@ -61,7 +61,7 b''
        "output_type": "pyout",
        "prompt_number": 2,
        "text": [
-        "<matplotlib.collections.PathCollection at 0x10f8a0b50>"
+        "<matplotlib.collections.PathCollection at 0x10d7b5650>"
        ]
       }
      ],
@@ -696,7 +696,10 b''
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "parsing and evaluating line \"nosuchvar\". R traceback: \"Error in eval(expr, envir, enclos) : object 'nosuchvar' not found",
+        "parsing and evaluating line \"nosuchvar\".",
+        "R error message: \"Error in eval(expr, envir, enclos) : object 'nosuchvar' not found",
+        "\"",
+        " R stdout:\"Error in eval(expr, envir, enclos) : object 'nosuchvar' not found",
         "\"",
         "",
         ""