patch 8.1.1690: default padding for popup window menu is too much

Problem:    Default padding for popup window menu is too much.
Solution:   Only add padding left and right.

diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
index f74a7c228b9c14195c3b80d2af3ff32c9a27d32c..0fd30ebfbe3bbab8028cce40dc60a7a161c9cc8c 100644 (file)
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.1.  Last change: 2019 Jul 13
+*popup.txt*  For Vim version 8.1.  Last change: 2019 Jul 14
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -362,7 +362,7 @@ popup_menu({what}, {options})                                *popup_menu()*
                                \ drag: 1,
                                \ wrap: 0,
                                \ border: [],
-                               \ padding: [],
+                               \ padding: [0,1,0,1],
                                \ filter: 'popup_filter_menu',
                                \ })
 <              The current line is highlighted with a match using

diff --git a/src/popupwin.c b/src/popupwin.c
index c6c5910a3043dec4f01d805bcc6a489c59804073..e61b793cd41646c0d4f8b9ba9f5c94a5ba94cc41 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1299,7 +1299,7 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type)
        for (i = 0; i < 4; ++i)
        {
            wp->w_popup_border[i] = 1;
-           wp->w_popup_padding[i] = 1;
+           wp->w_popup_padding[i] = (i & 1) ? 1 : 0;
        }
     }
 

diff --git a/src/testdir/dumps/Test_popupwin_menu_01.dump b/src/testdir/dumps/Test_popupwin_menu_01.dump
index 479edf6e02d2b6f897862e92f69035b56cf6d63f..bc1552018c6d5c391b91352f193d0ef7990b62c0 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_01.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_01.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @20|╔+0#0000001#ffd7ff255| |m|a|k|e| |a| |c|h|o|i|c|e| |f|r|o|m| |t|h|e| |l|i|s|t| |╗| +0#0000000#ffffff0@21
-|3| @20|â\95\91+0#0000001#ffd7ff255| @28|â\95\91| +0#0000000#ffffff0@21
+|2| @73
+|3| @20|â\95\94+0#0000001#ffd7ff255| |m|a|k|e| |a| |c|h|o|i|c|e| |f|r|o|m| |t|h|e| |l|i|s|t| |â\95\97| +0#0000000#ffffff0@21
 |4| @20|║+0#0000001#ffd7ff255| |o+0#0000000#5fd7ff255|n|e| +0#0000001#ffd7ff255@24|║| +0#0000000#ffffff0@21
 |5| @20|║+0#0000001#ffd7ff255| |t|w|o| @24|║| +0#0000000#ffffff0@21
 |6| @20|║+0#0000001#ffd7ff255| |a|n|o|t|h|e|r| @20|║| +0#0000000#ffffff0@21
-|7| @20|â\95\91+0#0000001#ffd7ff255| @28|â\95\91| +0#0000000#ffffff0@21
-|8| @20|╚+0#0000001#ffd7ff255|═@28|╝| +0#0000000#ffffff0@21
+|7| @20|â\95\9a+0#0000001#ffd7ff255|â\95\90@28|â\95\9d| +0#0000000#ffffff0@21
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_02.dump b/src/testdir/dumps/Test_popupwin_menu_02.dump
index 4a407d472dcd255debd813b5bfc47ccc5639129a..594daf4c871aa320fa1aeef86d4faffe68cd0218 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_02.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_02.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @20|╔+0#0000001#ffd7ff255| |m|a|k|e| |a| |c|h|o|i|c|e| |f|r|o|m| |t|h|e| |l|i|s|t| |╗| +0#0000000#ffffff0@21
-|3| @20|â\95\91+0#0000001#ffd7ff255| @28|â\95\91| +0#0000000#ffffff0@21
+|2| @73
+|3| @20|â\95\94+0#0000001#ffd7ff255| |m|a|k|e| |a| |c|h|o|i|c|e| |f|r|o|m| |t|h|e| |l|i|s|t| |â\95\97| +0#0000000#ffffff0@21
 |4| @20|║+0#0000001#ffd7ff255| |o|n|e| @24|║| +0#0000000#ffffff0@21
 |5| @20|║+0#0000001#ffd7ff255| |t|w|o| @24|║| +0#0000000#ffffff0@21
 |6| @20|║+0#0000001#ffd7ff255| |a+0#0000000#5fd7ff255|n|o|t|h|e|r| +0#0000001#ffd7ff255@20|║| +0#0000000#ffffff0@21
-|7| @20|â\95\91+0#0000001#ffd7ff255| @28|â\95\91| +0#0000000#ffffff0@21
-|8| @20|╚+0#0000001#ffd7ff255|═@28|╝| +0#0000000#ffffff0@21
+|7| @20|â\95\9a+0#0000001#ffd7ff255|â\95\90@28|â\95\9d| +0#0000000#ffffff0@21
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_maxwidth_1.dump b/src/testdir/dumps/Test_popupwin_menu_maxwidth_1.dump
index 1711165373549acc3ae7517b205e6bffd038afed..813fb36126a427bdfff354610a6bb21e8ea6e636 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_maxwidth_1.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_maxwidth_1.dump
@@ -1,13 +1,13 @@
 >╔+0#0000001#ffd7ff255|═@2|╗| +0#0000000#ffffff0@9|╔+0#0000001#ffd7ff255|═@11|╗| +0#0000000#ffffff0@2|╔+0#0000001#ffd7ff255|═@12|╗| +0#0000000#ffffff0@27
-|║+0#0000001#ffd7ff255| @2|║| +0#0000000#ffffff0@9|║+0#0000001#ffd7ff255| @11|║| +0#0000000#ffffff0@2|║+0#0000001#ffd7ff255| @12|║| +0#0000000#ffffff0@27
 |║+0#0000001#ffd7ff255| |x+0&#e0e0e08| +0&#ffd7ff255|║| +0#0000000#ffffff0@9|║+0#0000001#ffd7ff255| |1+0&#e0e0e08|2|3|4|5|6|7|8|9||| +0&#ffd7ff255|║| +0#0000000#ffffff0@2|║+0#0000001#ffd7ff255| |1+0&#e0e0e08|2|3|4|5|6|7|8|9||| +0&#ffd7ff255| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@27
-|â\95\91+0#0000001#ffd7ff255| @2|â\95\91| +0#0000000#ffffff0@9|â\95\91+0#0000001#ffd7ff255| @11|â\95\91| +0#0000000#ffffff0@2|║+0#0000001#ffd7ff255| |1|2|3|4|5|6|7|8|9||| | +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@27
-|╚+0#0000001#ffd7ff255|═@2|╝| +0#0000000#ffffff0@9|╚+0#0000001#ffd7ff255|═@11|╝| +0#0000000#ffffff0@2|║+0#0000001#ffd7ff255| |1|2|3|4|5|6|7|8|9||| | +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@27
-|6| @30|║+0#0000001#ffd7ff255| @12|║| +0#0000000#ffffff0@27
-|╔+0#0000001#ffd7ff255|═@11|╗| +0#0000000#ffffff0|╔+0#0000001#ffd7ff255|═@11|╗| +0#0000000#ffffff0@2|╚+0#0000001#ffd7ff255|═@12|╝| +0#0000000#ffffff0@27
-|â\95\91+0#0000001#ffd7ff255| @11|â\95\91| +0#0000000#ffffff0|â\95\91+0#0000001#ffd7ff255| @11|â\95\91| +0#0000000#ffffff0@45
+|â\95\9a+0#0000001#ffd7ff255|â\95\90@2|â\95\9d| +0#0000000#ffffff0@9|â\95\9a+0#0000001#ffd7ff255|â\95\90@11|â\95\9d| +0#0000000#ffffff0@2|║+0#0000001#ffd7ff255| |1|2|3|4|5|6|7|8|9||| | +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@27
+|4| @30|║+0#0000001#ffd7ff255| |1|2|3|4|5|6|7|8|9||| | +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@27
+|5| @30|╚+0#0000001#ffd7ff255|═@12|╝| +0#0000000#ffffff0@27
+|6| @73
+|â\95\94+0#0000001#ffd7ff255|â\95\90@11|â\95\97| +0#0000000#ffffff0|â\95\94+0#0000001#ffd7ff255|â\95\90@11|â\95\97| +0#0000000#ffffff0@45
 |║+0#0000001#ffd7ff255| |1+0&#e0e0e08|2|3|4|5|6|7|8|9||| +0&#ffd7ff255|║| +0#0000000#ffffff0|║+0#0000001#ffd7ff255| |1+0&#e0e0e08|2|3|4|5|6|7|8|9||| +0&#ffd7ff255|║| +0#0000000#ffffff0@45
-|║+0#0000001#ffd7ff255| @11|║| +0#0000000#ffffff0|║+0#0000001#ffd7ff255| @11|║| +0#0000000#ffffff0@45
-|╚+0#0000001#ffd7ff255|═@11|╝| +0#4040ff13#ffffff0|╚+0#0000001#ffd7ff255|═@11|╝| +0#4040ff13#ffffff0@45
+|╚+0#0000001#ffd7ff255|═@11|╝| +0#0000000#ffffff0|╚+0#0000001#ffd7ff255|═@11|╝| +0#0000000#ffffff0@45
+|1|0| @72
+|~+0#4040ff13&| @73
 |~| @73
 | +0#0000000&@56|1|,|1| @10|A|l@1| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_scroll_1.dump b/src/testdir/dumps/Test_popupwin_menu_scroll_1.dump
index a2dc0a643c4422cd5b1f7eab6705fd717d00a972..8db8436f087e7682001b717cd4d6ad03a4b4b2a5 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_scroll_1.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_scroll_1.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
-|3| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
+|2| @73
+|3| @29|â\95\94+0#0000001#ffd7ff255|â\95\90@10|â\95\97| +0#0000000#ffffff0@30
 |4| @29|║+0#0000001#ffd7ff255| |o|n|e| @5| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |5| @29|║+0#0000001#ffd7ff255| |t+0&#e0e0e08|w|o| +0&#ffd7ff255@5| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |6| @29|║+0#0000001#ffd7ff255| |t|h|r|e@1| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
-|7| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
-|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
+|7| @29|â\95\9a+0#0000001#ffd7ff255|â\95\90@10|â\95\9d| +0#0000000#ffffff0@30
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_scroll_2.dump b/src/testdir/dumps/Test_popupwin_menu_scroll_2.dump
index 5d5cb146b130b43937c0a3f3d0838d4737d8859d..2b8d27050f1f0a9c6cd67487150818b903dbe469 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_scroll_2.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_scroll_2.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
-|3| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
+|2| @73
+|3| @29|â\95\94+0#0000001#ffd7ff255|â\95\90@10|â\95\97| +0#0000000#ffffff0@30
 |4| @29|║+0#0000001#ffd7ff255| |t|h|r|e@1| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |5| @29|║+0#0000001#ffd7ff255| |f|o|u|r| @4| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |6| @29|║+0#0000001#ffd7ff255| |f+0&#e0e0e08|i|v|e| +0&#ffd7ff255@4| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
-|7| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
-|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
+|7| @29|â\95\9a+0#0000001#ffd7ff255|â\95\90@10|â\95\9d| +0#0000000#ffffff0@30
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_scroll_3.dump b/src/testdir/dumps/Test_popupwin_menu_scroll_3.dump
index 7a5a6c0a634f7a89c06f5cd040d3ebf9ca6d2965..ca958122d2a39077df91dc626f7b46f4e4eae60b 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_scroll_3.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_scroll_3.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
-|3| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
+|2| @73
+|3| @29|â\95\94+0#0000001#ffd7ff255|â\95\90@10|â\95\97| +0#0000000#ffffff0@30
 |4| @29|║+0#0000001#ffd7ff255| |s|e|v|e|n| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |5| @29|║+0#0000001#ffd7ff255| |e|i|g|h|t| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |6| @29|║+0#0000001#ffd7ff255| |n+0&#e0e0e08|i|n|e| +0&#ffd7ff255@4| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
-|7| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
-|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
+|7| @29|â\95\9a+0#0000001#ffd7ff255|â\95\90@10|â\95\9d| +0#0000000#ffffff0@30
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_scroll_4.dump b/src/testdir/dumps/Test_popupwin_menu_scroll_4.dump
index 528496c4b87fa18c83a551cea0cdf0110c4222b0..dece66aa105fd6cf17f611750420a140238ab9fb 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_scroll_4.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_scroll_4.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
-|3| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
+|2| @73
+|3| @29|â\95\94+0#0000001#ffd7ff255|â\95\90@10|â\95\97| +0#0000000#ffffff0@30
 |4| @29|║+0#0000001#ffd7ff255| |s+0&#e0e0e08|e|v|e|n| +0&#ffd7ff255@3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |5| @29|║+0#0000001#ffd7ff255| |e|i|g|h|t| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |6| @29|║+0#0000001#ffd7ff255| |n|i|n|e| @4| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
-|7| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
-|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
+|7| @29|â\95\9a+0#0000001#ffd7ff255|â\95\90@10|â\95\9d| +0#0000000#ffffff0@30
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_scroll_5.dump b/src/testdir/dumps/Test_popupwin_menu_scroll_5.dump
index 893a7df9397d67b3115e5375328b03800d69d55d..0410eb9036ab628bce1e0e00cf9179c7088c4e2a 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_scroll_5.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_scroll_5.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
-|3| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
+|2| @73
+|3| @29|â\95\94+0#0000001#ffd7ff255|â\95\90@10|â\95\97| +0#0000000#ffffff0@30
 |4| @29|║+0#0000001#ffd7ff255| |s+0&#e0e0e08|i|x| +0&#ffd7ff255@5| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |5| @29|║+0#0000001#ffd7ff255| |s|e|v|e|n| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |6| @29|║+0#0000001#ffd7ff255| |e|i|g|h|t| @3| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
-|7| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
-|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
+|7| @29|â\95\9a+0#0000001#ffd7ff255|â\95\90@10|â\95\9d| +0#0000000#ffffff0@30
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/dumps/Test_popupwin_menu_scroll_6.dump b/src/testdir/dumps/Test_popupwin_menu_scroll_6.dump
index 1980dd4d86c579f8ab9c4b61ebd558cafc6b335f..55726bb83913c2d9aa00f0ba6155a66ecfa66dc4 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_menu_scroll_6.dump
+++ b/src/testdir/dumps/Test_popupwin_menu_scroll_6.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
-|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
-|3| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
+|2| @73
+|3| @29|â\95\94+0#0000001#ffd7ff255|â\95\90@10|â\95\97| +0#0000000#ffffff0@30
 |4| @29|║+0#0000001#ffd7ff255| |o+0&#e0e0e08|n|e| +0&#ffd7ff255@5| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |5| @29|║+0#0000001#ffd7ff255| |t|w|o| @5| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
 |6| @29|║+0#0000001#ffd7ff255| |t|h|r|e@1| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
-|7| @29|â\95\91+0#0000001#ffd7ff255| @10|â\95\91| +0#0000000#ffffff0@30
-|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
+|7| @29|â\95\9a+0#0000001#ffd7ff255|â\95\90@10|â\95\9d| +0#0000000#ffffff0@30
+|8| @73
 |9| @73
 @57|1|,|1| @10|T|o|p| 

diff --git a/src/version.c b/src/version.c
index 19c04a5f4208fde70805637b85c1828aca496201..0c56f7d76bbee3cd934f5da91ae9e3c26e92f23f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1690,
 /**/
     1689,
 /**/