summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_netbeans.py2
-rw-r--r--src/testdir/test_netbeans.vim8
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 4 deletions
diff --git a/src/testdir/test_netbeans.py b/src/testdir/test_netbeans.py
index e0d291d60..bdebb54dd 100644
--- a/src/testdir/test_netbeans.py
+++ b/src/testdir/test_netbeans.py
@@ -42,7 +42,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
myfile.write(received)
response = ''
- if received.find('README.txt') > 0:
+ if received.find('XREADME.txt') > 0:
name = received.split('"')[1]
response = '5:putBufferNumber!33 "' + name + '"\n'
response += '5:setDot!1 3/19\n'
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index aa4e67661..66177ada7 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -20,13 +20,14 @@ endfunc
func Nb_basic(port)
call delete("Xnetbeans")
call writefile([], "Xnetbeans")
+ call writefile(repeat(['abcdefghijklmnopqrstuvwxyz'], 5), "XREADME.txt")
exe 'nbstart :localhost:' . a:port . ':bunny'
call assert_true(has("netbeans_enabled"))
call WaitFor('len(readfile("Xnetbeans")) > 2')
- split +$ README.txt
+ split +$ XREADME.txt
- " Opening README.txt will result in a setDot command
+ " Opening XREADME.txt will result in a setDot command
call WaitFor('len(readfile("Xnetbeans")) > 4')
call WaitFor('getcurpos()[1] == 3')
let pos = getcurpos()
@@ -41,11 +42,12 @@ 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 "README.txt" T F', substitute(lines[3], '".*/', '"', ''))
+ call assert_equal('0:fileOpened=0 "XREADME.txt" T F', substitute(lines[3], '".*/', '"', ''))
call assert_equal('0:disconnect=1', lines[6])
call delete("Xnetbeans")
+ call delete("XREADME.txt")
endfunc
func Test_nb_basic()
diff --git a/src/version.c b/src/version.c
index 3d4fa68df..1fb70f882 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 549,
+/**/
548,
/**/
547,