summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-17 17:16:12 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-17 17:16:12 +0100
commit493fbe4abee660d30b4f2aef87b754b0a720213c (patch)
treec3ac9eaa2480b0dd117a4ac71cc2e213a543c6b2 /runtime
parent26967617a30e55aedc98b8f14b841d88469abd0e (diff)
patch 8.1.1017: off-by-one error in filetype detectionv8.1.1017
Problem: Off-by-one error in filetype detection. Solution: Also check the last line of the file.
Diffstat (limited to 'runtime')
-rw-r--r--runtime/autoload/dist/ft.vim12
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index de45faa4f8..a97bad3b56 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -197,7 +197,7 @@ func dist#ft#FTe()
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 @@ endfunc
" 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 @@ func dist#ft#FThtml()
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 @@ endfunc
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 @@ endfunc
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