summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-08 17:50:41 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-08 17:50:41 +0200
commit4a4b821085847651b71d8ad9fab9f180635cb453 (patch)
tree77b3350f5a27d5853916c612752db499abaec9fd
parenta09a2c5857ab854f0870573b5160da1964c905a2 (diff)
downloadvim-git-4a4b821085847651b71d8ad9fab9f180635cb453.tar.gz
patch 7.4.857v7.4.857
Problem: Dragging the current tab with the mouse doesn't work properly. Solution: Take the current tabpage index into account. (Hirohito Higashi)
-rw-r--r--src/normal.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/normal.c b/src/normal.c
index ae7b83ad2..69b0dcecb 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2561,7 +2561,8 @@ do_mouse(oap, c, dir, count, fixindent)
if (in_tab_line)
{
c1 = TabPageIdxs[mouse_col];
- tabpage_move(c1 <= 0 ? 9999 : c1 - 1);
+ tabpage_move(c1 <= 0 ? 9999 : c1 < tabpage_index(curtab)
+ ? c1 - 1 : c1);
}
return FALSE;
}
diff --git a/src/version.c b/src/version.c
index a3b567ef8..3fb4ad2fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 857,
+/**/
856,
/**/
855,