mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 7.4.2351
Problem: Netbeans test fails when run from unpacked MS-Windows sources. Solution: Open README.txt instead of Makefile.
This commit is contained in:
@@ -42,10 +42,10 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler):
|
|||||||
myfile.write(received)
|
myfile.write(received)
|
||||||
|
|
||||||
response = ''
|
response = ''
|
||||||
if received.find('Makefile') > 0:
|
if received.find('README.txt') > 0:
|
||||||
name = received.split('"')[1]
|
name = received.split('"')[1]
|
||||||
response = '5:putBufferNumber!33 "' + name + '"\n'
|
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:
|
elif received.find('disconnect') > 0:
|
||||||
# we're done
|
# we're done
|
||||||
self.server.shutdown()
|
self.server.shutdown()
|
||||||
|
@@ -23,13 +23,13 @@ func Nb_basic(port)
|
|||||||
call assert_true(has("netbeans_enabled"))
|
call assert_true(has("netbeans_enabled"))
|
||||||
|
|
||||||
call WaitFor('len(readfile("Xnetbeans")) > 2')
|
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('len(readfile("Xnetbeans")) > 4')
|
||||||
call WaitFor('getcurpos()[1] == 2')
|
call WaitFor('getcurpos()[1] == 2')
|
||||||
let pos = getcurpos()
|
let pos = getcurpos()
|
||||||
call assert_equal(2, pos[1])
|
call assert_equal(3, pos[1])
|
||||||
call assert_equal(20, pos[2])
|
call assert_equal(20, pos[2])
|
||||||
close
|
close
|
||||||
nbclose
|
nbclose
|
||||||
@@ -39,7 +39,7 @@ func Nb_basic(port)
|
|||||||
call assert_equal('AUTH bunny', lines[0])
|
call assert_equal('AUTH bunny', lines[0])
|
||||||
call assert_equal('0:version=0 "2.5"', lines[1])
|
call assert_equal('0:version=0 "2.5"', lines[1])
|
||||||
call assert_equal('0:startupDone=0', lines[2])
|
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])
|
call assert_equal('0:disconnect=1', lines[6])
|
||||||
|
|
||||||
|
@@ -763,6 +763,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2351,
|
||||||
/**/
|
/**/
|
||||||
2350,
|
2350,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user