neovim

commit 4533c40786a68d57b878babd46ea70e761392cf0
parent 4281a514e9b751a5a83b29659bdcc9dd8fcd5d06
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 11 Mar 2025 06:23:12 +0800

vim-patch:9.1.1194: filetype: false positive help filetype detection

Problem:  filetype: false positive help filetype detection
Solution: Only detect a file as help if modeline appears either at start
          of line or is preceded by whitespace (zeertzjq).

closes: vim/vim#16845

https://github.com/vim/vim/commit/6763b0ee95e7e66ab7992653fbba48691e803e70

Diffstat:
M
runtime/lua/vim/filetype.lua
 | 
2
+-
M
test/old/testdir/test_filetype.vim
 | 
11
+++++++++++

2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
@@ -2417,7 +2417,7 @@ local pattern = {
     ['^%.?gtkrc'] = starsetf('gtkrc'),
     ['/doc/.*%.txt$'] = function(_, bufnr)
       local line = M._getline(bufnr, -1)
-      local ml = line:find('vim:')
+      local ml = line:find('^vim:') or line:find('%svim:')
       if ml and M._matchregex(line:sub(ml), [[\<\(ft\|filetype\)=help\>]]) then
         return 'help'
       end
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
@@ -1628,11 +1628,22 @@ func Test_help_file()
   call assert_equal('help', &filetype)
   bwipe!
 
+  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 writefile(['some text'], 'doc/nothelp.txt', 'D')
   split doc/nothelp.txt
   call assert_notequal('help', &filetype)
   bwipe!
 
+  call writefile(['some text', '`vim:ft=help`'], 'doc/nothelp1.txt', 'D')
+  split doc/nothelp1.txt
+  call assert_notequal('help', &filetype)
+  bwipe!
+
   filetype off
   set modeline&
 endfunc