GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1286: filetype: help files not detected when 'iskeyword' includes ":"

Browse Source 
Problem:  Help files not detected when 'iskeyword' includes ":".
Solution: Do not use \< and \> in the pattern (zeertzjq).

fixes: #17069
closes: #17071

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-04-07 21:14:41 +02:00
committed by Christian Brabandt
parent 5ce1e4ad4a
commit e370141bf4
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/filetype.vim
View File

@ -53,7 +53,7 @@ endfunc
" Vim help file, set ft explicitly, because 'modeline' might be off
au BufNewFile,BufRead */doc/*.txt
\ if getline('$') =~ '\(^\|\s\)vim:.*\<\(ft\|filetype\)=help\>'
\ if getline('$') =~ '\%(^\|\s\)vim:\%(.*\%(:\|\s\)\)\?\%(ft\|filetype\)=help\%(:\|\s\|$\)'
\| setf help
\| endif

28
src/testdir/test_filetype.vim
View File

@ -1635,20 +1635,36 @@ func Test_haredoc_file()
endfunc
func Test_help_file()
func! s:Check_help_with_iskeyword(fname)
exe 'split' a:fname
call assert_equal('help', &filetype)
bwipe!
set iskeyword+=:
exe 'split' a:fname
call assert_equal('help', &filetype)
bwipe!
set iskeyword&
endfunc
set nomodeline
filetype on
call assert_true(mkdir('doc', 'pR'))
call writefile(['some text', 'vim:ft=help:'], 'doc/help.txt', 'D')
split doc/help.txt
call assert_equal('help', &filetype)
bwipe!
call s:Check_help_with_iskeyword('doc/help.txt')
call writefile(['some text', 'Copyright: |manual-copyright| vim:ft=help:'],
\ 'doc/help1.txt', 'D')
split doc/help1.txt
call assert_equal('help', &filetype)
bwipe!
call s:Check_help_with_iskeyword('doc/help1.txt')
call writefile(['some text', 'vim:noet:ft=help:'], 'doc/help2.txt', 'D')
call s:Check_help_with_iskeyword('doc/help2.txt')
call writefile(['some text', 'vim: noet ft=help'], 'doc/help3.txt', 'D')
call s:Check_help_with_iskeyword('doc/help3.txt')
call writefile(['some text', 'vim: ft=help noet'], 'doc/help4.txt', 'D')
call s:Check_help_with_iskeyword('doc/help4.txt')
call writefile(['some text'], 'doc/nothelp.txt', 'D')
split doc/nothelp.txt

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1286,
/**/
1285,
/**/