Merge #4231 'vim-patch:7.4.857'.

This commit is contained in:
Justin M. Keyes 2016-02-29 22:17:05 -05:00
commit 36cb847d09
2 changed files with 7 additions and 4 deletions

View File

@ -2344,9 +2344,12 @@ do_mouse (
if (mouse_row == 0 && firstwin->w_winrow > 0) { if (mouse_row == 0 && firstwin->w_winrow > 0) {
if (is_drag) { if (is_drag) {
if (in_tab_line) { if (in_tab_line) {
tabpage_move(tab_page_click_defs[mouse_col].type == kStlClickTabClose if (tab_page_click_defs[mouse_col].type == kStlClickTabClose) {
? 9999 tabpage_move(9999);
: tab_page_click_defs[mouse_col].tabnr - 1); } else {
int tabnr = tab_page_click_defs[mouse_col].tabnr;
tabpage_move(tabnr < tabpage_index(curtab) ? tabnr - 1 : tabnr);
}
} }
return false; return false;
} }

View File

@ -433,7 +433,7 @@ static int included_patches[] = {
// 860 NA // 860 NA
859, 859,
858, 858,
// 857, 857,
856, 856,
// 855 NA // 855 NA
// 854 NA // 854 NA