Mercurial > vim
diff runtime/autoload/dist/ft.vim @ 15527:963dd629d19a v8.1.0771
patch 8.1.0771: some shell filetype patterns end in a star
commit https://github.com/vim/vim/commit/147e7d0caba8b66ff11622e514142bcc3d24403a
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 18 21:46:47 2019 +0100
patch 8.1.0771: some shell filetype patterns end in a star
Problem: Some shell filetype patterns end in a star.
Solution: Make sure that patterns not ending in a star are preferred.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 18 Jan 2019 22:00:06 +0100 |
| parents | 2b30a2b4bde2 |
| children | 7fd3a9eaeedb |
line wrap: on
line diff
--- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -1,7 +1,7 @@ " Vim functions for file type detection " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2017 Dec 05 +" Last Change: 2019 Jan 18 " These functions are moved here from runtime/filetype.vim to make startup " faster. @@ -484,6 +484,10 @@ endfunc " Called from filetype.vim and scripts.vim. func dist#ft#SetFileTypeSH(name) + if did_filetype() + " Filetype was already detected + return + endif if expand("<amatch>") =~ g:ft_ignore_pat return endif @@ -531,6 +535,10 @@ endfunc " as used for Tcl. " Also called from scripts.vim, thus can't be local to this script. func dist#ft#SetFileTypeShell(name) + if did_filetype() + " Filetype was already detected + return + endif if expand("<amatch>") =~ g:ft_ignore_pat return endif @@ -551,6 +559,10 @@ func dist#ft#SetFileTypeShell(name) endfunc func dist#ft#CSH() + if did_filetype() + " Filetype was already detected + return + endif if exists("g:filetype_csh") call dist#ft#SetFileTypeShell(g:filetype_csh) elseif &shell =~ "tcsh"