From 535e24011597ff5c9c15cc423415bf259d759fbd 2016-01-13 17:14:52
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: 2016-01-13 17:14:52
Subject: [PATCH] Only use our Enter handling when the default buffer is active

Fixes Ctrl-R search

---

diff --git a/IPython/terminal/ptshell.py b/IPython/terminal/ptshell.py
index 364ec7b..3b5e436 100644
--- a/IPython/terminal/ptshell.py
+++ b/IPython/terminal/ptshell.py
@@ -1,6 +1,8 @@
 from IPython.core.interactiveshell import InteractiveShell
 
 from prompt_toolkit.completion import Completer, Completion
+from prompt_toolkit.enums import DEFAULT_BUFFER
+from prompt_toolkit.filters import HasFocus, HasSelection
 from prompt_toolkit.history import InMemoryHistory
 from prompt_toolkit.shortcuts import create_prompt_application
 from prompt_toolkit.interface import CommandLineInterface
@@ -46,7 +48,9 @@ class PTInteractiveShell(InteractiveShell):
 
     def init_prompt_toolkit_cli(self):
         kbmanager = KeyBindingManager.for_prompt()
-        @kbmanager.registry.add_binding(Keys.ControlJ) # Ctrl+J == Enter, seemingly
+        # Ctrl+J == Enter, seemingly
+        @kbmanager.registry.add_binding(Keys.ControlJ,
+                            filter=HasFocus(DEFAULT_BUFFER) & ~HasSelection())
         def _(event):
             b = event.current_buffer
             if not b.document.on_last_line: