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 add5a41..3471dd9 100644
--- a/src/testdir/test_netbeans.py
+++ b/src/testdir/test_netbeans.py
@@ -42,10 +42,10 @@
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 9105168..77fc2bc 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -23,13 +23,13 @@
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 @@
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 14c49ed..2409c12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2351,
+/**/
2350,
/**/
2349,
