Merge pull request #1053 from ipython/rawin

minor improvements to text placement in qtconsole.

This closes  #993, and although it's not the long-term implementation we want, it does fix the user-facing problem pretty robustly.

IPython/frontend/qt/console/console_widget.py

@@ -772,7 +772,7 class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):
         """
         # Determine where to insert the content.
         cursor = self._control.textCursor()
-        if before_prompt and not self._executing:
+        if before_prompt and (self._reading or not self._executing):
             cursor.setPosition(self._append_before_prompt_pos)
         else:
             cursor.movePosition(QtGui.QTextCursor.End)

IPython/frontend/qt/console/frontend_widget.py

@@ -599,7 +599,9 class FrontendWidget(HistoryConsoleWidget, BaseFrontendMixin):
                     self.kernel_manager.restart_kernel(now=now)
                 except RuntimeError:
                     self._append_plain_text('Kernel started externally. '
-                                            'Cannot restart.\n')
+                                            'Cannot restart.\n',
+                                            before_prompt=True
+                                            )
                 else:
                     self.reset()
             else:
@@ -607,7 +609,9 class FrontendWidget(HistoryConsoleWidget, BaseFrontendMixin):
 
         else:
             self._append_plain_text('Kernel process is either remote or '
-                                    'unspecified. Cannot restart.\n')
+                                    'unspecified. Cannot restart.\n',
+                                    before_prompt=True
+                                    )
 
     #---------------------------------------------------------------------------
     # 'FrontendWidget' protected interface