changeset 23612:8dbebce07695 v8.2.2348

patch 8.2.2348: no check for modified files after focus gained Commit: https://github.com/vim/vim/commit/fadd55bd633b3b84d41a691e953f569bb6c21689 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 14 19:19:18 2021 +0100 patch 8.2.2348: no check for modified files after focus gained Problem: No check for modified files after focus gained. (Mathias Stearn) Solution: Call ui_focus_change().
author Bram Moolenaar <Bram@vim.org>
date Thu, 14 Jan 2021 19:30:04 +0100
parents 181ae0ba5950
children cbabd97da7d8
files src/term.c src/ui.c src/version.c
diffstat 3 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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)
 /*
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2348,
+/**/
     2347,
 /**/
     2346,