From 0428d2775c56b7eee664e2f6afd6ccab1de9eed9 Mon Sep 17 00:00:00 2001
From: Yaraslau Tamashevich <yaraslau.tamashevich@gmail.com>
Date: Wed, 21 Feb 2024 22:36:16 +0200
Subject: [PATCH] Fix key bindings and search prompt

---
 metainfo.xml                    | 1 +
 src/contour/TerminalSession.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/metainfo.xml b/metainfo.xml
index 5406088e8c..1145599200 100644
--- a/metainfo.xml
+++ b/metainfo.xml
@@ -111,6 +111,7 @@
           <li>Add SGRSAVE and SGRRESTORE VT sequences to save and restore SGR state (They intentionally conflict with XTPUSHSGR and XTPOPSGR)</li>
           <li>Fixes corruption of sixel image on high resolution (#1049)</li>
           <li>Fixes bad wording of OS/X to macOS (#1462)</li>
+          <li>Fixed key bindings and search prompt collision (#1472)</li>
         </ul>
       </description>
     </release>
diff --git a/src/contour/TerminalSession.cpp b/src/contour/TerminalSession.cpp
index 15ada27a35..8de5100224 100644
--- a/src/contour/TerminalSession.cpp
+++ b/src/contour/TerminalSession.cpp
@@ -807,8 +807,10 @@ void TerminalSession::sendCharEvent(
 
     if (eventType != KeyboardEventType::Release)
     {
+        // find if action exist for the given key, and ignore if editing search prompt
         if (auto const* actions =
-                config::apply(_config.inputMappings.value().charMappings, value, modifiers, matchModeFlags()))
+                config::apply(_config.inputMappings.value().charMappings, value, modifiers, matchModeFlags());
+            actions && !_terminal.inputHandler().isEditingSearch())
         {
             executeAllActions(*actions);
             return;