patch 8.2.1335: CTRL-C in the GUI doesn't interruptv8.2.1335

Problem:    CTRL-C in the GUI doesn't interrupt. (Sergey Vlasov)
Solution:   Recognize "C" with CTRL modifier as CTRL-C. (issue #6565)

1 files changed, 9 insertions, 7 deletions

diff --git a/src/gui_x11.c b/src/gui_x11.c
index 26d02e7738..1402407c2f 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -970,14 +970,16 @@ gui_x11_key_hit_cb(
 	add_to_input_buf(string2, 3);
     }
 
-    if (len == 1 && ((string[0] == Ctrl_C && ctrl_c_interrupts)
-#ifdef UNIX
-	    || (intr_char != 0 && string[0] == intr_char)
-#endif
-	    ))
+    // Check if the key interrupts.
     {
-	trash_input_buf();
-	got_int = TRUE;
+	int int_ch = check_for_interrupt(key, modifiers);
+
+	if (int_ch != NUL)
+	{
+	    trash_input_buf();
+	    string[0] = int_ch;
+	    len = 1;
+	}
     }
 
     add_to_input_buf(string, len);