Skip to content

Commit d9b3509

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents c574994 + 4287ed3 commit d9b3509

3 files changed

Lines changed: 17 additions & 8 deletions

File tree

src/popupmnu.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,26 +252,30 @@ pum_display(
252252
{
253253
/* align right pum edge with "col" */
254254
#ifdef FEAT_RIGHTLEFT
255-
if (curwin->w_p_rl)
255+
if (curwin->w_p_rl
256+
&& col < max_width + pum_scrollbar + 1)
256257
{
257258
pum_col = col + max_width + pum_scrollbar + 1;
258259
if (pum_col >= Columns)
259260
pum_col = Columns - 1;
260261
}
261-
else
262+
else if (!curwin->w_p_rl)
262263
#endif
263264
{
264-
pum_col = col - max_width - pum_scrollbar;
265-
if (pum_col < 0)
266-
pum_col = 0;
265+
if (col > Columns - max_width - pum_scrollbar)
266+
{
267+
pum_col = Columns - max_width - pum_scrollbar;
268+
if (pum_col < 0)
269+
pum_col = 0;
270+
}
267271
}
268272

269273
#ifdef FEAT_RIGHTLEFT
270274
if (curwin->w_p_rl)
271-
pum_width = W_ENDCOL(curwin) - pum_col - pum_scrollbar + 1;
275+
pum_width = pum_col - pum_scrollbar + 1;
272276
else
273277
#endif
274-
pum_width = pum_col - pum_scrollbar;
278+
pum_width = Columns - pum_col - pum_scrollbar;
275279

276280
if (pum_width < p_pw)
277281
{

src/terminal.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
* - in GUI vertical split causes problems. Cursor is flickering. (Hirohito
4444
* Higashi, 2017 Sep 19)
4545
* - Trigger TerminalOpen event? #2422 patch in #2484
46-
* - Shift-Tab does not work.
4746
* - after resizing windows overlap. (Boris Staletic, #2164)
4847
* - Redirecting output does not work on MS-Windows, Test_terminal_redir_file()
4948
* is disabled.
@@ -874,6 +873,8 @@ term_convert_key(term_T *term, int c, char *buf)
874873
case K_S_UP: mod = VTERM_MOD_SHIFT;
875874
key = VTERM_KEY_UP; break;
876875
case TAB: key = VTERM_KEY_TAB; break;
876+
case K_S_TAB: mod = VTERM_MOD_SHIFT;
877+
key = VTERM_KEY_TAB; break;
877878

878879
case K_MOUSEUP: other = term_send_mouse(vterm, 5, 1); break;
879880
case K_MOUSEDOWN: other = term_send_mouse(vterm, 4, 1); break;

src/version.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,10 @@ static char *(features[]) =
786786

787787
static int included_patches[] =
788788
{ /* Add new patch number below this line */
789+
/**/
790+
1522,
791+
/**/
792+
1521,
789793
/**/
790794
1520,
791795
/**/

0 commit comments

Comments
 (0)