mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
patch 9.1.1186: filetype: help files in git repos are not detected
Problem: filetype: help files in git repos are not detected Solution: detect */doc/*.txt files as help if they end with a help modeline, even if 'modeline' is off Here's how I checked that this would still detect vim's own help files correctly: $ find . -type f -path '*/doc/*.txt' \ > -exec awk '{ } ENDFILE { print FILENAME ":" $0; }' '{}' + | > grep -v 'vim:.*\<\(ft\|filetype\)=help\>' ./src/libvterm/doc/seqs.txt: 23 DECSM 42 = DECNRCM, national/multinational character closes: #16817 Signed-off-by: David Mandelberg <david@mandelberg.org> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
parent
ce4f9d2a10
commit
16d6fff98e
@ -1,4 +1,4 @@
|
|||||||
*todo.txt* For Vim version 9.1. Last change: 2025 Feb 21
|
*todo.txt* For Vim version 9.1. Last change: 2025 Mar 08
|
||||||
|
|
||||||
|
|
||||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||||
@ -6276,5 +6276,4 @@ Far future and "big" extensions:
|
|||||||
are reflected in each Vim immediately. Could work with local files but
|
are reflected in each Vim immediately. Could work with local files but
|
||||||
also over the internet. See http://www.codingmonkeys.de/subethaedit/.
|
also over the internet. See http://www.codingmonkeys.de/subethaedit/.
|
||||||
|
|
||||||
vim:tw=78:sw=4:sts=4:ts=8:noet:ft=help:norl:
|
vim:tw=78:sw=4:sts=4:ts=8:noet:ft=help:norl:fo+=n:
|
||||||
vim: set fo+=n :
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
" Vim support file to detect file types
|
" Vim support file to detect file types
|
||||||
"
|
"
|
||||||
" Maintainer: The Vim Project <https://github.com/vim/vim>
|
" Maintainer: The Vim Project <https://github.com/vim/vim>
|
||||||
" Last Change: 2025 Mar 06
|
" Last Change: 2025 Mar 08
|
||||||
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
|
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
|
||||||
|
|
||||||
" Listen very carefully, I will say this only once
|
" Listen very carefully, I will say this only once
|
||||||
@ -51,8 +51,11 @@ func s:StarSetf(ft)
|
|||||||
endif
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
" Vim help file
|
" Vim help file, set ft explicitly, because 'modeline' might be off
|
||||||
au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
|
au BufNewFile,BufRead */doc/*.txt
|
||||||
|
\ if getline('$') =~ 'vim:.*\<\(ft\|filetype\)=help\>'
|
||||||
|
\| setf help
|
||||||
|
\| endif
|
||||||
|
|
||||||
" Abaqus or Trasys
|
" Abaqus or Trasys
|
||||||
au BufNewFile,BufRead *.inp call dist#ft#Check_inp()
|
au BufNewFile,BufRead *.inp call dist#ft#Check_inp()
|
||||||
|
@ -919,8 +919,6 @@ def s:GetFilenameChecks(): dict<list<string>>
|
|||||||
'.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zsh_history',
|
'.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zsh_history',
|
||||||
'.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file',
|
'.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file',
|
||||||
'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file'],
|
'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file'],
|
||||||
|
|
||||||
help: [$VIMRUNTIME .. '/doc/help.txt'],
|
|
||||||
}
|
}
|
||||||
enddef
|
enddef
|
||||||
|
|
||||||
@ -1626,6 +1624,23 @@ func Test_haredoc_file()
|
|||||||
filetype off
|
filetype off
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_help_file()
|
||||||
|
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 writefile(['some text'], 'doc/nothelp.txt', 'D')
|
||||||
|
split doc/nothelp.txt
|
||||||
|
call assert_notequal('help', &filetype)
|
||||||
|
bwipe!
|
||||||
|
|
||||||
|
filetype off
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_hook_file()
|
func Test_hook_file()
|
||||||
filetype on
|
filetype on
|
||||||
|
|
||||||
|
@ -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 */
|
||||||
|
/**/
|
||||||
|
1186,
|
||||||
/**/
|
/**/
|
||||||
1185,
|
1185,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user