patch 7.4.2351

Problem:    Netbeans test fails when run from unpacked MS-Windows sources.
Solution:   Open README.txt instead of Makefile.

diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py
index add5a412ee4cec06dd101545c287f43a9a5500b2..3471dd95268a1c0ba5b7887f19cd0057981cf147 100644 (file)
--- a/src/testdir/test_netbeans.py
+++ b/src/testdir/test_netbeans.py
@@ -42,10 +42,10 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
                 myfile.write(received)
 
             response = ''
-            if received.find('Makefile') > 0:
+            if received.find('README.txt') > 0:
                 name = received.split('"')[1]
                 response = '5:putBufferNumber!33 "' + name + '"\n'
-                response += '5:setDot!1 2/19\n'
+                response += '5:setDot!1 3/19\n'
             elif received.find('disconnect') > 0:
                 # we're done
                 self.server.shutdown()

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 910516889c9e93d82bb8bdc668a6d6a47ad65bb9..77fc2bcad70a03a5d0de12e436583b4409b624cc 100644 (file)
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -23,13 +23,13 @@ func Nb_basic(port)
   call assert_true(has("netbeans_enabled"))
 
   call WaitFor('len(readfile("Xnetbeans")) > 2')
-  split +$ Makefile
+  split +$ README.txt
 
-  " Opening Makefile will result in a setDot command
+  " Opening README.txt will result in a setDot command
   call WaitFor('len(readfile("Xnetbeans")) > 4')
   call WaitFor('getcurpos()[1] == 2')
   let pos = getcurpos()
-  call assert_equal(2, pos[1])
+  call assert_equal(3, pos[1])
   call assert_equal(20, pos[2])
   close
   nbclose
@@ -39,7 +39,7 @@ func Nb_basic(port)
   call assert_equal('AUTH bunny', lines[0])
   call assert_equal('0:version=0 "2.5"', lines[1])
   call assert_equal('0:startupDone=0', lines[2])
-  call assert_equal('0:fileOpened=0 "Makefile" T F', substitute(lines[3], '".*/', '"', ''))
+  call assert_equal('0:fileOpened=0 "README.txt" T F', substitute(lines[3], '".*/', '"', ''))
 
   call assert_equal('0:disconnect=1', lines[6])
 

diff --git a/src/version.c b/src/version.c
index 14c49edd5d3b0da1b4058352c7df75824c1311b4..2409c128c2fbc427678195ffb16ee0d560dc317f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2351,
 /**/
     2350,
 /**/