Mercurial > vim

changeset 17563:cc2c4179427c v8.1.1779

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1779: not showing the popup window right border is confusing commit https://github.com/vim/vim/commit/8edf0e31323a4293524f51f2960f4f3064309526 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 30 21:19:26 2019 +0200 patch 8.1.1779: not showing the popup window right border is confusing Problem: Not showing the popup window right border is confusing. Solution: Also show the border when 'wrap' is off. (closes https://github.com/vim/vim/issues/4747)
author Bram Moolenaar <Bram@vim.org>
date Tue, 30 Jul 2019 21:30:05 +0200
parents 53c3a926f290
children 59dcae93845f
files src/popupwin.c src/testdir/dumps/Test_popupwin_20.dump src/testdir/dumps/Test_popupwin_21.dump src/version.c
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1076,7 +1076,9 @@ popup_adjust_position(win_T *wp)
 	}
     }
 
-    if (wp->w_p_wrap)
+    if (wp->w_p_wrap || (!wp->w_popup_fixed
+			    && (wp->w_popup_pos == POPPOS_TOPLEFT
+				|| wp->w_popup_pos == POPPOS_BOTLEFT)))
     {
 	int want_col = 0;
 
--- a/src/testdir/dumps/Test_popupwin_20.dump
+++ b/src/testdir/dumps/Test_popupwin_20.dump
@@ -8,7 +8,7 @@
 |8| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12||+0#0000001#ffd7ff255| @2|w|r|a|p@1|e|d| |l|o|n|g|e|r| |t|e| @2||
 |9+0#0000000#ffffff0| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12||+0#0000001#ffd7ff255| @2|x|t| @17||
 |1+0#0000000#ffffff0|0| @72
-|1@1| @50||+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t
+|1@1| @46||+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t| @2||
 |1+0#0000000#ffffff0|2| @72
 |1|3| @72
 |1|4| @72
--- a/src/testdir/dumps/Test_popupwin_21.dump
+++ b/src/testdir/dumps/Test_popupwin_21.dump
@@ -8,7 +8,7 @@
 |8| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12|║+0#0000001#ffd7ff255| @2|w|r|a|p@1|e|d| |l|o|n|g|e|r| |t|e| @2|║
 |9+0#0000000#ffffff0| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12|║+0#0000001#ffd7ff255| @2|x|t| @17|║
 |1+0#0000000#ffffff0|0| @72
-|1@1| @50|║+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t
+|1@1| @46|║+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t| @2|║
 |1+0#0000000#ffffff0|2| @72
 |1|3| @72
 |1|4| @72
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1779,
+/**/
     1778,
 /**/
     1777,