diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-29 22:17:05 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-03-02 01:08:38 -0500 |
| commit | 36cb847d09afc840f9875b93d504650332b623c3 (patch) | |
| tree | 47fbe47491a2327df43a9865b126d7b374244554 | |
| parent | be7d6ba6c137d541f625914a4c37a2811eb8f805 (diff) | |
| parent | 162d4bb3c621c5f2a19caa46cb35a2363744ac56 (diff) | |
| download | rneovim-36cb847d09afc840f9875b93d504650332b623c3.tar.gz rneovim-36cb847d09afc840f9875b93d504650332b623c3.tar.bz2 rneovim-36cb847d09afc840f9875b93d504650332b623c3.zip | |
Merge #4231 'vim-patch:7.4.857'.
| -rw-r--r-- | src/nvim/normal.c | 9 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index e064d34e09..f5fb47568e 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -2344,9 +2344,12 @@ do_mouse ( if (mouse_row == 0 && firstwin->w_winrow > 0) { if (is_drag) { if (in_tab_line) { - tabpage_move(tab_page_click_defs[mouse_col].type == kStlClickTabClose - ? 9999 - : tab_page_click_defs[mouse_col].tabnr - 1); + if (tab_page_click_defs[mouse_col].type == kStlClickTabClose) { + tabpage_move(9999); + } else { + int tabnr = tab_page_click_defs[mouse_col].tabnr; + tabpage_move(tabnr < tabpage_index(curtab) ? tabnr - 1 : tabnr); + } } return false; } diff --git a/src/nvim/version.c b/src/nvim/version.c index 3acecf2b40..6a367cb16e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -433,7 +433,7 @@ static int included_patches[] = { // 860 NA 859, 858, - // 857, + 857, 856, // 855 NA // 854 NA |