Merge remote-tracking branch 'vim/master'

Author: splhack

src/popupmnu.c

@@ -252,26 +252,30 @@ pum_display(
 	    {
 		/* align right pum edge with "col" */
 #ifdef FEAT_RIGHTLEFT
-		if (curwin->w_p_rl)
+		if (curwin->w_p_rl
+			&& col < max_width + pum_scrollbar + 1)
 		{
 		    pum_col = col + max_width + pum_scrollbar + 1;
 		    if (pum_col >= Columns)
 			pum_col = Columns - 1;
 		}
-		else
+		else if (!curwin->w_p_rl)
 #endif
 		{
-		    pum_col = col - max_width - pum_scrollbar;
-		    if (pum_col < 0)
-			pum_col = 0;
+		    if (col > Columns - max_width - pum_scrollbar)
+		    {
+			pum_col = Columns - max_width - pum_scrollbar;
+			if (pum_col < 0)
+			    pum_col = 0;
+		    }
 		}
 
 #ifdef FEAT_RIGHTLEFT
 		if (curwin->w_p_rl)
-		    pum_width = W_ENDCOL(curwin) - pum_col - pum_scrollbar + 1;
+		    pum_width = pum_col - pum_scrollbar + 1;
 		else
 #endif
-		    pum_width = pum_col - pum_scrollbar;
+		    pum_width = Columns - pum_col - pum_scrollbar;
 
 		if (pum_width < p_pw)
 		{

src/terminal.c

@@ -43,7 +43,6 @@
  * - in GUI vertical split causes problems.  Cursor is flickering. (Hirohito
  *   Higashi, 2017 Sep 19)
  * - Trigger TerminalOpen event?  #2422  patch in #2484
- * - Shift-Tab does not work.
  * - after resizing windows overlap. (Boris Staletic, #2164)
  * - Redirecting output does not work on MS-Windows, Test_terminal_redir_file()
  *   is disabled.
@@ -874,6 +873,8 @@ term_convert_key(term_T *term, int c, char *buf)
 	case K_S_UP:		mod = VTERM_MOD_SHIFT;
 				key = VTERM_KEY_UP; break;
 	case TAB:		key = VTERM_KEY_TAB; break;
+	case K_S_TAB:		mod = VTERM_MOD_SHIFT;
+				key = VTERM_KEY_TAB; break;
 
 	case K_MOUSEUP:		other = term_send_mouse(vterm, 5, 1); break;
 	case K_MOUSEDOWN:	other = term_send_mouse(vterm, 4, 1); break;

src/version.c

@@ -786,6 +786,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1522,
+/**/
+    1521,
 /**/
     1520,
 /**/