summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-30 19:03:22 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-30 19:03:22 +0200
commit54fabd4b5e373c7f1d794d24d27a30a8bac84da1 (patch)
tree80ba1dd110f2d2e64f6764f1cb563fe8e67e638e
parentb42301247d85d60b64c2cc23f5cdf30da2342827 (diff)
patch 8.1.1427: popup window screenshot test failsv8.1.1427
Problem: Popup window screenshot test fails. Solution: Add missing change to popup window code.
-rw-r--r--src/popupwin.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/popupwin.c b/src/popupwin.c
index c9265367bf..ee59af2eae 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -265,6 +265,8 @@ f_popup_create(typval_T *argvars, typval_T *rettv)
buf->b_p_swf = FALSE; // no swap file
buf->b_p_bl = FALSE; // unlisted buffer
buf->b_locked = TRUE;
+ // Avoid that 'buftype' is reset when this buffer is entered.
+ buf->b_p_initialized = TRUE;
nr = (int)dict_get_number(d, (char_u *)"tab");
if (nr == 0)
diff --git a/src/version.c b/src/version.c
index 0420cb60bb..282d045e65 100644
--- 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 */
/**/
+ 1427,
+/**/
1426,
/**/
1425,