# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1503433805 -7200
# Node ID d2eea20ee14af76b63a3c84803eb70013524734c
# Parent  dca6adb817335ac7ad76f93e74a172dd5ec2ea69
patch 8.0.0987: terminal: second byte of double-byte char wrong

commit https://github.com/vim/vim/commit/d2c45a1964ddb0d9ac16c9c985051fab41f37840
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Aug 22 22:29:00 2017 +0200

    patch 8.0.0987: terminal: second byte of double-byte char wrong

    Problem:    terminal: second byte of double-byte char wrong
    Solution:   Set the second byte to NUL only for utf-8 and non-multibyte.

diff --git a/src/terminal.c b/src/terminal.c
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2130,7 +2130,7 @@ term_update_window(win_T *wp)
 						       (char*)mb, 2, 0, 0) > 1)
 			{
 			    ScreenLines[off] = mb[0];
-			    ScreenLines[off+1] = mb[1];
+			    ScreenLines[off + 1] = mb[1];
 			    cell.width = mb_ptr2cells(mb);
 			}
 			else
@@ -2148,8 +2148,12 @@ term_update_window(win_T *wp)
 		{
 		    if (enc_utf8)
 			ScreenLinesUC[off] = NUL;
-		    else if (!has_mbyte)
+
+		    /* don't set the second byte to NUL for a DBCS encoding, it
+		     * has been set above */
+		    if (enc_utf8 || !has_mbyte)
 			ScreenLines[off] = NUL;
+
 		    ++pos.col;
 		    ++off;
 		}
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    987,
+/**/
     986,
 /**/
     985,