From 82e743c5b343847d88b958594ad3433213ef9405 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 26 Mar 2020 15:39:53 +0100
Subject: patch 8.2.0451: Win32: double-width character displayed incorrectly

Problem:    Win32: double-width character displayed incorrectly.
Solution:   First move the cursor to the first column. (Nobuhiro Takasaki,
            closes #5848)
---
 src/os_win32.c | 6 ++++++
 src/version.c  | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/os_win32.c b/src/os_win32.c
index e9d22e417a..1952b3636b 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5821,6 +5821,12 @@ gotoxy(
 
     if (!USE_VTP)
     {
+	// There are reports of double-width characters not displayed
+	// correctly.  This workaround should fix it, similar to how it's done
+	// for VTP.
+	g_coord.X = 0;
+	SetConsoleCursorPosition(g_hConOut, g_coord);
+
 	// external cursor coords are 1-based; internal are 0-based
 	g_coord.X = x - 1;
 	g_coord.Y = y - 1;
diff --git a/src/version.c b/src/version.c
index 0fecc973b5..12e287dce5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    451,
 /**/
     450,
 /**/
-- 
cgit v1.2.3