patch 8.2.2348: no check for modified files after focus gained

brammool · brammool · commit fadd55bd633b · 2021-01-14T19:19:18.000+01:00
Problem:    No check for modified files after focus gained. (Mathias Stearn)
Solution:   Call ui_focus_change().
diff --git a/src/term.c b/src/term.c
@@ -5708,30 +5708,20 @@ check_termcode(
 		&& key_name[0] == KS_EXTRA
 	    )
 	{
-	    int did_aucmd = FALSE;
-
 	    if (key_name[1] == KE_FOCUSGAINED && !focus_state)
 	    {
-		did_aucmd = apply_autocmds(EVENT_FOCUSGAINED,
-						    NULL, NULL, FALSE, curbuf);
+		ui_focus_change(TRUE);
 		did_cursorhold = TRUE;
 		focus_state = TRUE;
 		key_name[1] = (int)KE_IGNORE;
 	    }
 	    else if (key_name[1] == KE_FOCUSLOST && focus_state)
 	    {
-		did_aucmd = apply_autocmds(EVENT_FOCUSLOST,
-						    NULL, NULL, FALSE, curbuf);
+		ui_focus_change(FALSE);
 		did_cursorhold = TRUE;
 		focus_state = FALSE;
 		key_name[1] = (int)KE_IGNORE;
 	    }
-	    if (did_aucmd && (State & (NORMAL | INSERT | TERMINAL)))
-	    {
-		// in case a message was displayed: reposition the cursor
-		setcursor();
-		out_flush();
-	    }
 	}
 #endif
 
diff --git a/src/ui.c b/src/ui.c
@@ -1101,7 +1101,6 @@ check_row(int row)
     return row;
 }
 
-#if defined(FEAT_GUI) || defined(MSWIN) || defined(PROTO)
 /*
  * Called when focus changed.  Used for the GUI or for systems where this can
  * be done in the console (Win32).
@@ -1164,7 +1163,6 @@ ui_focus_change(
 	maketitle();
 #endif
 }
-#endif
 
 #if defined(HAVE_INPUT_METHOD) || defined(PROTO)
 /*
diff --git a/src/version.c b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2348,
 /**/
     2347,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -5708,30 +5708,20 @@ check_termcode(`
`5708`	`5708`	`&& key_name[0] == KS_EXTRA`
`5709`	`5709`	`)`
`5710`	`5710`	`{`
`5711`		`- int did_aucmd = FALSE;`
`5712`		`-`
`5713`	`5711`	`if (key_name[1] == KE_FOCUSGAINED && !focus_state)`
`5714`	`5712`	`{`
`5715`		`- did_aucmd = apply_autocmds(EVENT_FOCUSGAINED,`
`5716`		`- NULL, NULL, FALSE, curbuf);`
	`5713`	`+ ui_focus_change(TRUE);`
`5717`	`5714`	`did_cursorhold = TRUE;`
`5718`	`5715`	`focus_state = TRUE;`
`5719`	`5716`	`key_name[1] = (int)KE_IGNORE;`
`5720`	`5717`	`}`
`5721`	`5718`	`else if (key_name[1] == KE_FOCUSLOST && focus_state)`
`5722`	`5719`	`{`
`5723`		`- did_aucmd = apply_autocmds(EVENT_FOCUSLOST,`
`5724`		`- NULL, NULL, FALSE, curbuf);`
	`5720`	`+ ui_focus_change(FALSE);`
`5725`	`5721`	`did_cursorhold = TRUE;`
`5726`	`5722`	`focus_state = FALSE;`
`5727`	`5723`	`key_name[1] = (int)KE_IGNORE;`
`5728`	`5724`	`}`
`5729`		`- if (did_aucmd && (State & (NORMAL \| INSERT \| TERMINAL)))`
`5730`		`- {`
`5731`		`- // in case a message was displayed: reposition the cursor`
`5732`		`- setcursor();`
`5733`		`- out_flush();`
`5734`		`- }`
`5735`	`5725`	`}`
`5736`	`5726`	`#endif`
`5737`	`5727`
Original file line number	Diff line number	Diff line change
`@@ -1101,7 +1101,6 @@ check_row(int row)`
`1101`	`1101`	`return row;`
`1102`	`1102`	`}`
`1103`	`1103`
`1104`		`-#if defined(FEAT_GUI) \|\| defined(MSWIN) \|\| defined(PROTO)`
`1105`	`1104`	`/*`
`1106`	`1105`	`* Called when focus changed. Used for the GUI or for systems where this can`
`1107`	`1106`	`* be done in the console (Win32).`
`@@ -1164,7 +1163,6 @@ ui_focus_change(`
`1164`	`1163`	`maketitle();`
`1165`	`1164`	`#endif`
`1166`	`1165`	`}`
`1167`		`-#endif`
`1168`	`1166`
`1169`	`1167`	`#if defined(HAVE_INPUT_METHOD) \|\| defined(PROTO)`
`1170`	`1168`	`/*`