Merge branch 'juliantaylor-multiline-history'

Restore multiline history (on by default) as it worked in the 0.10.x
series.  A new configuration variable
InteractiveShell.multiline_history can be set to control this behavior
for users who prefer not to have it on.

When True, cells spanning multiple lines will be saved in history as a
single entry instead of one entry per line

Closes gh-571.

IPython/core/interactiveshell.py

@@ -307,6 +307,9 b' class InteractiveShell(SingletonConfigurable, Magic):'
         Automatically call the pdb debugger after every exception.
         """
     )
+    multiline_history = CBool(True, config=True,
+        help="Store multiple line spanning cells as a single entry in history."
+    )
 
     prompt_in1 = Unicode('In [\\#]: ', config=True)
     prompt_in2 = Unicode('   .\\D.: ', config=True)
@@ -1791,9 +1794,13 b' class InteractiveShell(SingletonConfigurable, Magic):'
         for _, _, cell in self.history_manager.get_tail(1000,
                                                         include_latest=True):
             if cell.strip(): # Ignore blank lines
-                for line in cell.splitlines():
-                    self.readline.add_history(py3compat.unicode_to_str(line,
-                                                                stdin_encoding))
+                if self.multiline_history:
+                      self.readline.add_history(py3compat.unicode_to_str(cell.rstrip(),
+                                                                         stdin_encoding))
+                else:
+                    for line in cell.splitlines():
+                        self.readline.add_history(py3compat.unicode_to_str(line,
+                                                                           stdin_encoding))
 
     def set_next_input(self, s):
         """ Sets the 'default' input string for the next command line.

IPython/frontend/terminal/interactiveshell.py

@@ -229,6 +229,14 b' class TerminalInteractiveShell(InteractiveShell):'
                     # handling seems rather unpredictable...
                     self.write("\nKeyboardInterrupt in interact()\n")
 
+    def _replace_rlhist_multiline(self, source_raw, hlen_before_cell):
+        """Store multiple lines as a single entry in history"""
+        if self.multiline_history and self.has_readline:
+            hlen = self.readline.get_current_history_length()
+            for i in range(hlen - hlen_before_cell):
+                self.readline.remove_history_item(hlen - i - 1)
+            self.readline.add_history(source_raw.rstrip())
+
     def interact(self, display_banner=None):
         """Closely emulate the interactive Python console."""
 
@@ -245,6 +253,7 b' class TerminalInteractiveShell(InteractiveShell):'
             self.show_banner()
 
         more = False
+        hlen_before_cell = self.readline.get_current_history_length()
 
         # Mark activity in the builtins
         __builtin__.__dict__['__IPYTHON__active'] += 1
@@ -281,7 +290,9 b' class TerminalInteractiveShell(InteractiveShell):'
                 #double-guard against keyboardinterrupts during kbdint handling
                 try:
                     self.write('\nKeyboardInterrupt\n')
-                    self.input_splitter.reset()
+                    source_raw = self.input_splitter.source_raw_reset()[1]
+                    self._replace_rlhist_multiline(source_raw, hlen_before_cell)
+                    hlen_before_cell = self.readline.get_current_history_length()
                     more = False
                 except KeyboardInterrupt:
                     pass
@@ -309,6 +320,8 b' class TerminalInteractiveShell(InteractiveShell):'
                     self.edit_syntax_error()
                 if not more:
                     source_raw = self.input_splitter.source_raw_reset()[1]
+                    self._replace_rlhist_multiline(source_raw, hlen_before_cell)
+                    hlen_before_cell = self.readline.get_current_history_length()
                     self.run_cell(source_raw, store_history=True)
 
         # We are off again...