diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index 95135c8b8f..5014e75442 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -3,7 +3,7 @@ vim9script # Vim functions for file type detection # # Maintainer: The Vim Project -# Last Change: 2025 Apr 21 +# Last Change: 2025 Jun 17 # Former Maintainer: Bram Moolenaar # These functions are moved here from runtime/filetype.vim to make startup @@ -184,9 +184,18 @@ enddef export def FTll() if getline(1) =~ ';\|\\|\' setf llvm - else - setf lifelines + return endif + var n = 1 + while n < 100 && n <= line("$") + var line = getline(n) + if line =~ '^\s*%' + setf lex + return + endif + n += 1 + endwhile + setf lifelines enddef export def FTlpc() diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 76229eddeb..f90c6f87bb 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1420,7 +1420,7 @@ au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf setf sensors " LFTP au BufNewFile,BufRead lftp.conf,.lftprc,*lftp/rc setf lftp -" Lifelines (or Lex for C++!) +" Lifelines, LLVM, or Lex for C++ au BufNewFile,BufRead *.ll call dist#ft#FTll() " Lilo: Linux loader diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index c2ea8f1eef..3ae16e418b 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -2634,6 +2634,12 @@ func Test_ll_file() call assert_equal('llvm', &filetype) bwipe! + " lex (C++) + call writefile(['%{', '#include ', '%}'], 'Xfile.ll', 'D') + split Xfile.ll + call assert_equal('lex', &filetype) + bwipe! + " lifelines call writefile(['proc main() {}'], 'Xfile.ll', 'D') split Xfile.ll diff --git a/src/version.c b/src/version.c index fc2abd85e6..0b6a3b028e 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1466, /**/ 1465, /**/