summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-03-14 15:35:52 +0100
committerBram Moolenaar <Bram@vim.org>2015-03-14 15:35:52 +0100
commit404c942fb85c390f4b73c1733088871b0b0d7964 (patch)
tree1a00888c089dd960b204958223be2af959098837
parent438b64ab71cd724129c4eec840be16c52602ebc8 (diff)
downloadvim-git-404c942fb85c390f4b73c1733088871b0b0d7964.tar.gz
updated for version 7.4.663v7.4.663
Problem: When using netbeans a buffer is not found in another tab. Solution: When 'switchbuf' is set to "usetab" then switch to another tab when possible. (Xavier de Gaye)
-rw-r--r--src/netbeans.c9
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/netbeans.c b/src/netbeans.c
index 4f6cf2f47..e9f791072 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -2691,8 +2691,15 @@ nb_do_cmd(
static void
nb_set_curbuf(buf_T *buf)
{
- if (curbuf != buf && buf_jump_open_win(buf) == NULL)
+ if (curbuf != buf) {
+ if (buf_jump_open_win(buf) != NULL)
+ return;
+# ifdef FEAT_WINDOWS
+ if ((swb_flags & SWB_USETAB) && buf_jump_open_tab(buf) != NULL)
+ return;
+# endif
set_curbuf(buf, DOBUF_GOTO);
+ }
}
/*
diff --git a/src/version.c b/src/version.c
index 5bb8a4c34..8a55ed615 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 */
/**/
+ 663,
+/**/
662,
/**/
661,