From 42d7b66b926108eeb61178e5f9e59d805e7d4617 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Fri, 16 Jun 2017 10:23:03 +0100
Subject: [PATCH] Support hitting escape to cancel a selection combine
 operation

Fixes #1443
---
 src/normal.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/normal.cc b/src/normal.cc
index 53e7cbd5..16f1a4c2 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -1606,6 +1606,9 @@ void combine_selections(Context& context, SelectionList list, Func func)
 
     on_next_key_with_autoinfo(context, KeymapMode::None,
                              [func, list](Key key, Context& context) mutable {
+                                 if (key == Key::Escape)
+                                     return;
+
                                  const auto op = key_to_combine_op(key);
                                  auto& sels = context.selections();
                                  list.update();