From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 15 Apr 2020 19:05:30 +0000 (+0200)
Subject: patch 8.2.0581: Win32 console: the cursor position is always top-left
X-Git-Tag: v8.2.0581
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81ccbf199f0d553efdd57bec9bb8e23d91d2fb0d;p=vim

patch 8.2.0581: Win32 console: the cursor position is always top-left

Problem:    Win32 console: the cursor position is always top-left.
Solution:   Revert the patch for restoring screen.
---

diff --git a/src/os_win32.c b/src/os_win32.c
index 1132bbe18..b3e706164 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2612,12 +2612,8 @@ mch_init_c(void)
 	create_conin();
     g_hConOut = GetStdHandle(STD_OUTPUT_HANDLE);
 
-    vtp_flag_init();
-
 # ifdef FEAT_RESTORE_ORIG_SCREEN
     // Save the initial console buffer for later restoration
-    if (vtp_working && p_rs)
-	vtp_printf("\033[?1049h");
     SaveConsoleBuffer(&g_cbOrig);
     g_attrCurrent = g_attrDefault = g_cbOrig.Info.wAttributes;
 # else
@@ -2675,6 +2671,7 @@ mch_init_c(void)
     win_clip_init();
 # endif
 
+    vtp_flag_init();
     vtp_init();
 }
 
@@ -5434,6 +5431,9 @@ termcap_mode_start(void)
     if (g_fTermcapMode)
 	return;
 
+    if (!p_rs && USE_VTP)
+	vtp_printf("\033[?1049h");
+
     SaveConsoleBuffer(&g_cbNonTermcap);
 
     if (g_cbTermcap.IsValid)
@@ -5501,11 +5501,10 @@ termcap_mode_end(void)
 
 # ifdef FEAT_RESTORE_ORIG_SCREEN
     cb = exiting ? &g_cbOrig : &g_cbNonTermcap;
-    if (!(vtp_working && exiting))
 # else
     cb = &g_cbNonTermcap;
 # endif
-	RestoreConsoleBuffer(cb, p_rs);
+    RestoreConsoleBuffer(cb, p_rs);
     restore_console_color_rgb();
     SetConsoleCursorInfo(g_hConOut, &g_cci);
 
@@ -5531,16 +5530,11 @@ termcap_mode_end(void)
 	/*
 	 * Position the cursor at the leftmost column of the desired row.
 	 */
-# ifdef FEAT_RESTORE_ORG_SCREEN
-	if (!(vtp_working && exiting))
-# endif
-	    SetConsoleCursorPosition(g_hConOut, coord);
+	SetConsoleCursorPosition(g_hConOut, coord);
     }
 
-# ifdef FEAT_RESTORE_ORIG_SCREEN
-    if (vtp_working && p_rs && exiting)
+    if (!p_rs && USE_VTP)
 	vtp_printf("\033[?1049l");
-# endif
 
     g_fTermcapMode = FALSE;
 }
diff --git a/src/version.c b/src/version.c
index 0f0ee6d0a..6464bc5b8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    581,
 /**/
     580,
 /**/