averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master'

Browse Source
This commit is contained in:
Kazuki Sakamoto
2018-02-24 10:08:07 -08:00
parent d36056a922 bb008dd323
commit b2c38a1932
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/popupmnu.c
+2 -2
View File
@@ -253,7 +253,7 @@ pum_display(
/* align right pum edge with "col" */
#ifdef FEAT_RIGHTLEFT
if (curwin->w_p_rl
&& col < max_width + pum_scrollbar + 1)
&& W_ENDCOL(curwin) < max_width + pum_scrollbar + 1)
{
pum_col = col + max_width + pum_scrollbar + 1;
if (pum_col >= Columns)
@@ -262,7 +262,7 @@ pum_display(
else if (!curwin->w_p_rl)
#endif
{
if (col > Columns - max_width - pum_scrollbar)
if (curwin->w_wincol > Columns - max_width - pum_scrollbar)
{
pum_col = Columns - max_width - pum_scrollbar;
if (pum_col < 0)
src/version.c
+2
View File
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1538,
/**/
1537,
/**/