# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1559593804 -7200
# Node ID 90cec755ff80d98b885755fd5024870e4ccc5dc9
# Parent  f1cb217928e01bef8d25e1ee15d59ea8107538c4
patch 8.1.1459: popup window border looks bad when 'ambiwidth' is "double"

commit https://github.com/vim/vim/commit/3f6aeba18b3e29da98ab9326e66d287a997d98d1
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Jun 3 22:21:27 2019 +0200

    patch 8.1.1459: popup window border looks bad when 'ambiwidth' is "double"

    Problem:    Popup window border looks bad when 'ambiwidth' is "double".
                (Yasuhiro Matsumoto)
    Solution:   Only use line drawing characters when 'ambiwidth' is "single".
                (Ken Takata, closes #4477)

diff --git a/src/screen.c b/src/screen.c
--- a/src/screen.c
+++ b/src/screen.c
@@ -1078,7 +1078,9 @@ update_popups(void)
 		+ wp->w_height + wp->w_popup_padding[2] + wp->w_popup_border[2];
 	popup_attr = get_wcr_attr(wp);
 
-	if (enc_utf8)
+	// We can only use these line drawing characters when 'encoding' is
+	// "utf-8" and 'ambiwidth' is "single".
+	if (enc_utf8 && p_ambw == 's')
 	{
 	    border_char[0] = border_char[2] = 0x2550;
 	    border_char[1] = border_char[3] = 0x2551;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1459,
+/**/
     1458,
 /**/
     1457,