adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1366: v9.1.1364 unintentionally changed sign.c and sound.c

Browse Source 
Problem:  v9.1.1364 unintentionally changed sign.c and sound.c
Solution: revert those parts, adjust the test (Hirohito Higashi)

closes: #17264

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Hirohito Higashi
2025-05-06 18:13:29 +02:00
committed by Christian Brabandt
parent 0fb6ceac4c
commit 38972d8b1a
4 changed files with 1283 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/testdir/test_codestyle.vim
View File

@ -166,6 +166,9 @@ enddef
def Test_indent_of_source_files() def Test_indent_of_source_files()
for fname in glob('../*.[ch]', 0, 1) + ['../xxd/xxd.c'] for fname in glob('../*.[ch]', 0, 1) + ['../xxd/xxd.c']
execute 'tabnew ' .. fname execute 'tabnew ' .. fname
if &expandtab
continue
endif
for lnum in range(1, line('$')) for lnum in range(1, line('$'))
var name: string = synIDattr(synID(lnum, 1, 0), 'name') var name: string = synIDattr(synID(lnum, 1, 0), 'name')
if -1 == index(['cComment', 'cCommentStart'], name) if -1 == index(['cComment', 'cCommentStart'], name)
@ -173,7 +176,7 @@ def Test_indent_of_source_files()
var indent: string = matchstr(line, '^\s*') var indent: string = matchstr(line, '^\s*')
var tailing: string = matchstr(line, '\s*$') var tailing: string = matchstr(line, '\s*$')
if !empty(indent) if !empty(indent)
if indent !~# '^\t* \{0,7\}$' if indent !~# '^\t* \{0,7}$'
ReportError('testdir/' .. fname, lnum, 'invalid indent') ReportError('testdir/' .. fname, lnum, 'invalid indent')
endif endif
endif endif

2
src/version.c
View File

@ -704,6 +704,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 */
/**/
1366,
/**/ /**/
1365, 1365,
/**/ /**/