commit e5b7897585eccec84431d8b23df5cde2e283828c
author Bram Moolenaar <Bram@vim.org> Sat Feb 05 19:50:34 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Feb 05 19:50:34 2022 +0000
tree 83d97fce5b5fb6f39342e0a3868a51072b6fae16
parent 00eb99528edc9ee1d14241d6914168fc33331ded

patch 8.2.4305: tex filetype detection fails

Problem:    Tex filetype detection fails.
Solution:   Check value to be positive. (closes #9704)

runtime/autoload/dist/ft.vim

diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index d4e7be4..a8ca900 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -3,7 +3,7 @@
 # Vim functions for file type detection
 #
 # Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2022 Feb 04
+# Last Change:	2022 Feb 05
 
 # These functions are moved here from runtime/filetype.vim to make startup
 # faster.
@@ -722,7 +722,7 @@
   endif
   var save_cursor = getpos('.')
   call cursor(1, 1)
-  var has_use = search('^use\s\s*\k', 'c', 30)
+  var has_use = search('^use\s\s*\k', 'c', 30) > 0
   call setpos('.', save_cursor)
   if has_use
     setf perl
@@ -755,7 +755,8 @@
     var save_cursor = getpos('.')
     call cursor(1, 1)
     var firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
-    if firstNC # Check the next thousand lines for a LaTeX or ConTeXt keyword.
+    if firstNC > 0
+      # Check the next thousand lines for a LaTeX or ConTeXt keyword.
       var lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
       var cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
       var kwline = search('^\s*\\\%(' .. lpat .. '\)\|^\s*\\\(' .. cpat .. '\)',

src/testdir/test_filetype.vim

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 6f4a425..b9909c6 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -1306,4 +1306,23 @@
   filetype off
 endfunc
 
+func Test_tex_file()
+  filetype on
+
+  " only tests one case, should do more
+  let lines =<< trim END
+      % This is a sentence.
+
+      This is a sentence.
+  END
+  call writefile(lines, "Xfile.tex")
+  split Xfile.tex
+  call assert_equal('plaintex', &filetype)
+  bwipe
+
+  call delete('Xfile.tex')
+  filetype off
+endfunc
+
+
 " vim: shiftwidth=2 sts=2 expandtab

src/version.c

diff --git a/src/version.c b/src/version.c
index 3df4cfc..3d72eca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4305,
+/**/
     4304,
 /**/
     4303,