patch 8.0.1495: having 'pumwidth' default to zero has no merit

Problem:    Having 'pumwidth' default to zero has no merit.
Solution:   Make the default 15, as the actual default value.

diff --git a/src/option.c b/src/option.c
index 5e215d52d58da5420eeee3c3e68077c4f36c00b9..e54ba4e2de118294ee42c451c88c38f2abb7ad2f 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -2245,7 +2245,7 @@ static struct vimoption options[] =
 #else
                            (char_u *)NULL, PV_NONE,
 #endif
-                           {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
+                           {(char_u *)15L, (char_u *)15L} SCRIPTID_INIT},
     {"pythonthreedll",  NULL,   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
 #if defined(DYNAMIC_PYTHON3)
                            (char_u *)&p_py3dll, PV_NONE,

diff --git a/src/popupmnu.c b/src/popupmnu.c
index f53649f1232fb0875d118c905ad3222e2a1e56cb..09d9520a638ed890dd15cf276c4a00e26f4fda2b 100644 (file)
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -66,15 +66,6 @@ pum_compute_size(void)
     }
 }
 
-/*
- * Return the minimum width of the popup menu.
- */
-    static int
-pum_get_width(void)
-{
-    return p_pw == 0 ? PUM_DEF_WIDTH : p_pw;
-}
-
 /*
  * Show the popup menu with items "array[size]".
  * "array" must remain valid until pum_undisplay() is called!
@@ -102,7 +93,7 @@ pum_display(
 
     do
     {
-       def_width = pum_get_width();
+       def_width = p_pw;
        above_row = 0;
        below_row = cmdline_row;
 
@@ -225,10 +216,10 @@ pum_display(
        if (def_width < max_width)
            def_width = max_width;
 
-       if (((col < Columns - pum_get_width() || col < Columns - max_width)
+       if (((col < Columns - p_pw || col < Columns - max_width)
 #ifdef FEAT_RIGHTLEFT
                    && !curwin->w_p_rl)
-              || (curwin->w_p_rl && (col > pum_get_width() || col > max_width)
+              || (curwin->w_p_rl && (col > p_pw || col > max_width)
 #endif
           ))
        {
@@ -244,17 +235,17 @@ pum_display(
                pum_width = Columns - pum_col - pum_scrollbar;
 
            if (pum_width > max_width + pum_kind_width + pum_extra_width + 1
-                                               && pum_width > pum_get_width())
+                                               && pum_width > p_pw)
            {
                /* the width is too much, make it narrower */
                pum_width = max_width + pum_kind_width + pum_extra_width + 1;
-               if (pum_width < pum_get_width())
-                   pum_width = pum_get_width();
+               if (pum_width < p_pw)
+                   pum_width = p_pw;
            }
-           else if (((col > pum_get_width() || col > max_width)
+           else if (((col > p_pw || col > max_width)
 #ifdef FEAT_RIGHTLEFT
                        && !curwin->w_p_rl)
-               || (curwin->w_p_rl && (col < Columns - pum_get_width()
+               || (curwin->w_p_rl && (col < Columns - p_pw
                        || col < Columns - max_width)
 #endif
                    ))
@@ -282,9 +273,9 @@ pum_display(
 #endif
                    pum_width = pum_col - pum_scrollbar;
 
-               if (pum_width < pum_get_width())
+               if (pum_width < p_pw)
                {
-                   pum_width = pum_get_width();
+                   pum_width = p_pw;
 #ifdef FEAT_RIGHTLEFT
                    if (curwin->w_p_rl)
                    {
@@ -300,12 +291,12 @@ pum_display(
                }
                else if (pum_width > max_width + pum_kind_width
                                                          + pum_extra_width + 1
-                           && pum_width > pum_get_width())
+                           && pum_width > p_pw)
                {
                    pum_width = max_width + pum_kind_width
                                                         + pum_extra_width + 1;
-                   if (pum_width < pum_get_width())
-                       pum_width = pum_get_width();
+                   if (pum_width < p_pw)
+                       pum_width = p_pw;
                }
            }
 
@@ -323,8 +314,8 @@ pum_display(
        }
        else
        {
-           if (max_width > pum_get_width())
-               max_width = pum_get_width();    /* truncate */
+           if (max_width > p_pw)
+               max_width = p_pw;       /* truncate */
 #ifdef FEAT_RIGHTLEFT
            if (curwin->w_p_rl)
                pum_col = max_width - 1;

diff --git a/src/version.c b/src/version.c
index f5772a8c26a1eab60ab93b451deb7d5335b45df3..3a354753a26b35607195d971cef6bf5ab60e1b02 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1495,
 /**/
     1494,
 /**/