patch 8.1.1017: off-by-one error in filetype detection
Problem: Off-by-one error in filetype detection.
Solution: Also check the last line of the file.
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index de45faa..a97bad3 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -197,7 +197,7 @@
exe 'setf ' . g:filetype_euphoria
else
let n = 1
- while n < 100 && n < line("$")
+ while n < 100 && n <= line("$")
if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
setf specman
return
@@ -211,7 +211,7 @@
" Distinguish between HTML, XHTML and Django
func dist#ft#FThtml()
let n = 1
- while n < 10 && n < line("$")
+ while n < 10 && n <= line("$")
if getline(n) =~ '\<DTD\s\+XHTML\s'
setf xhtml
return
@@ -222,13 +222,13 @@
endif
let n = n + 1
endwhile
- setf html
+ setf FALLBACK html
endfunc
" Distinguish between standard IDL and MS-IDL
func dist#ft#FTidl()
let n = 1
- while n < 50 && n < line("$")
+ while n < 50 && n <= line("$")
if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
setf msidl
return
@@ -699,7 +699,7 @@
func dist#ft#FTxml()
let n = 1
- while n < 100 && n < line("$")
+ while n < 100 && n <= line("$")
let line = getline(n)
" DocBook 4 or DocBook 5.
let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
@@ -725,7 +725,7 @@
func dist#ft#FTy()
let n = 1
- while n < 100 && n < line("$")
+ while n < 100 && n <= line("$")
let line = getline(n)
if line =~ '^\s*%'
setf yacc
diff --git a/src/version.c b/src/version.c
index ff3628a..a49f6fb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1017,
+/**/
1016,
/**/
1015,