changeset 30471:584231b9b37e v9.0.0571

patch 9.0.0571: MS-Windows: CTRL-C can make Vim exit Commit: https://github.com/vim/vim/commit/f7e7302acb20b6ef6caa0740da1450b677ac91fb Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 24 13:10:04 2022 +0100 patch 9.0.0571: MS-Windows: CTRL-C can make Vim exit Problem: MS-Windows: CTRL-C can make Vim exit. Solution: Check the not-a-term argument.
author Bram Moolenaar <Bram@vim.org>
date Sat, 24 Sep 2022 14:15:04 +0200
parents 1c95c2c45126
children 9b141da86933
files src/main.c src/normal.c src/proto/main.pro src/version.c
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c
+++ b/src/main.c
@@ -1008,7 +1008,7 @@ common_init(mparm_T *paramp)
  * Return TRUE when the --not-a-term argument was found.
  */
     int
-is_not_a_term()
+is_not_a_term(void)
 {
     return params.not_a_term;
 }
@@ -1016,8 +1016,8 @@ is_not_a_term()
 /*
  * Return TRUE when the --not-a-term argument was found or the GUI is in use.
  */
-    static int
-is_not_a_term_or_gui()
+    int
+is_not_a_term_or_gui(void)
 {
     return params.not_a_term
 #ifdef FEAT_GUI
--- a/src/normal.c
+++ b/src/normal.c
@@ -6793,11 +6793,8 @@ nv_esc(cmdarg_T *cap)
 		&& !VIsual_active
 		&& no_reason)
 	{
-	    int	out_redir = !stdout_isatty
-#ifdef FEAT_GUI
-				&& !gui.in_use
-#endif
-				;
+	    int	out_redir = !stdout_isatty && !is_not_a_term_or_gui();
+
 	    // The user may accidentally do "vim file | grep word" and then
 	    // CTRL-C doesn't show anything.  With a changed buffer give the
 	    // message on stderr.  Without any changes might as well exit.
--- a/src/proto/main.pro
+++ b/src/proto/main.pro
@@ -2,6 +2,7 @@
 int vim_main2(void);
 void common_init(mparm_T *paramp);
 int is_not_a_term(void);
+int is_not_a_term_or_gui(void);
 char_u *get_gui_dialog_file(void);
 int op_pending(void);
 void may_trigger_safestate(int safe);
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    571,
+/**/
     570,
 /**/
     569,