Merge remote-tracking branch 'vim/master'

Author: splhack

src/term.c

@@ -5231,6 +5231,13 @@ check_termcode(max_offset, buf, bufsize, buflen)
 	    else
 		key_name[1] = get_pseudo_mouse_code(current_button,
 							   is_click, is_drag);
+
+	    /* Make sure the mouse position is valid.  Some terminals may
+	     * return weird values. */
+	    if (mouse_col >= Columns)
+		mouse_col = Columns - 1;
+	    if (mouse_row >= Rows)
+		mouse_row = Rows - 1;
 	}
 #endif /* FEAT_MOUSE */
 

src/testdir/test_utf8.in

@@ -9,7 +9,7 @@ STARTTEST
 :call setline(1, ["aaa", "あああ", "bbb"])
 :exe ":norm! gg0l\<C-V>jjIx\<Esc>"
 :let r = getline(1, '$')
-:
+:"
 :bwipeout!
 :$put=r
 :"
@@ -25,20 +25,20 @@ STARTTEST
 :	return ['あ', 'い']
 :endfunction
 :command -nargs=1 -complete=customlist,CustomComplete1 Test1 echo
-:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:call feedkeys(":Test1 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :function! CustomComplete2(lead, line, pos)
 :	return ['あたし', 'あたま', 'あたりめ']
 :endfunction
 :command -nargs=1 -complete=customlist,CustomComplete2 Test2 echo
-:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:call feedkeys(":Test2 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :function! CustomComplete3(lead, line, pos)
 :	return ['Nこ', 'Nん', 'Nぶ']
 :endfunction
 :command -nargs=1 -complete=customlist,CustomComplete3 Test3 echo
-:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 't')
-:
+:call feedkeys(":Test3 \<C-L>'\<C-B>$put='\<CR>", 'it')
+:"
 :call garbagecollect(1)
 :/^start:/,$wq! test.out
 ENDTEST

src/version.c

@@ -756,6 +756,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    936,
+/**/
+    935,
 /**/
     934,
 /**/

src/window.c

@@ -5790,6 +5790,8 @@ win_drag_vsep_line(dragwin, offset)
 	offset = room;		/* Move as far as we can */
     if (offset <= 0)		/* No room at all, quit. */
 	return;
+    if (fr == NULL)
+	return;			/* Safety check, should not happen. */
 
     /* grow frame fr by offset lines */
     frame_new_width(fr, fr->fr_width + offset, left, FALSE);