changeset 12066:8ad282dee649 v8.0.0913

patch 8.0.0913: MS-Windows: CTRL-C kills shell in terminal window commit https://github.com/vim/vim/commit/9698ad7201ca1a3acec69679f1ab8b15323ff406 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 12 14:52:15 2017 +0200 patch 8.0.0913: MS-Windows: CTRL-C kills shell in terminal window Problem: MS-Windows: CTRL-C kills shell in terminal window instead of the command running in the shell. Solution: Make CTRL-C only send a CTRL_C_EVENT and have CTRL-BREAK kill the job. (partly by Yasuhiro Matsumoto, closes #1962)
author Christian Brabandt <cb@256bit.org>
date Sat, 12 Aug 2017 15:00:04 +0200
parents 78404a915726
children 8b7edea4be26
files src/globals.h src/gui_w32.c src/os_win32.c src/terminal.c src/version.c
diffstat 5 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/globals.h
+++ b/src/globals.h
@@ -1671,6 +1671,10 @@ EXTERN int  did_echo_string_emsg INIT(= 
 EXTERN int *eval_lavars_used INIT(= NULL);
 #endif
 
+#ifdef WIN3264
+EXTERN int ctrl_break_was_pressed = FALSE;
+#endif
+
 /*
  * Optional Farsi support.  Include it here, so EXTERN and INIT are defined.
  */
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1840,6 +1840,7 @@ process_message(void)
 	{
 	    trash_input_buf();
 	    got_int = TRUE;
+	    ctrl_break_was_pressed = TRUE;
 	    string[0] = Ctrl_C;
 	    add_to_input_buf(string, 1);
 	}
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -6296,6 +6296,7 @@ mch_breakcheck(int force)
 #ifndef FEAT_GUI_W32	    /* never used */
     if (g_fCtrlCPressed || g_fCBrkPressed)
     {
+	ctrl_break_was_pressed = g_fCBrkPressed;
 	g_fCtrlCPressed = g_fCBrkPressed = FALSE;
 	got_int = TRUE;
     }
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1016,6 +1016,9 @@ term_vgetc()
     ++no_mapping;
     ++allow_keys;
     got_int = FALSE;
+#ifdef WIN3264
+    ctrl_break_was_pressed = FALSE;
+#endif
     c = vgetc();
     got_int = FALSE;
     --no_mapping;
@@ -1201,11 +1204,14 @@ terminal_loop(void)
 	may_send_sigint(c, curbuf->b_term->tl_job->jv_pid, 0);
 #endif
 #ifdef WIN3264
+	/* On Windows we do not know whether the job can handle CTRL-C itself
+	 * or not.  Therefore CTRL-C only sends a CTRL_C_EVENT to avoid killing
+	 * the shell instead of a command running in the shell.
+	 * Use CTRL-BREAK to kill the job. */
 	if (c == Ctrl_C)
-	    /* We don't know if the job can handle CTRL-C itself or not, this
-	     * may kill the shell instead of killing the command running in the
-	     * shell. */
-	    mch_signal_job(curbuf->b_term->tl_job, (char_u *)"quit");
+	    mch_signal_job(curbuf->b_term->tl_job, (char_u *)"int");
+	if (ctrl_break_was_pressed)
+	    mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill");
 #endif
 
 	if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL)
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    913,
+/**/
     912,
 /**/
     911,