updated for version 7.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)

diff --git a/src/netbeans.c b/src/netbeans.c
index 4f6cf2f47f2e354185da78806ae65169a1de7295..e9f791072f6b3fcf4d519bffeeabc18fc171660d 100644 (file)
--- 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 5bb8a4c34b2bb78e4312ca968464f6074da78bda..8a55ed6158dee0efe13c159c30657b3ca55859a2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    663,
 /**/
     662,
 /**/