diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-18 21:46:47 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-18 21:46:47 +0100 |
| commit | 147e7d0caba8b66ff11622e514142bcc3d24403a (patch) | |
| tree | 0858ea89583697da7e21d0c3fa20a9022a52dc53 /runtime/autoload | |
| parent | 1ac56c2d11da5ffa44db23e1fd0c533d02ab2f66 (diff) | |
| download | vim-git-147e7d0caba8b66ff11622e514142bcc3d24403a.tar.gz | |
patch 8.1.0771: some shell filetype patterns end in a starv8.1.0771
Problem: Some shell filetype patterns end in a star.
Solution: Make sure that patterns not ending in a star are preferred.
Diffstat (limited to 'runtime/autoload')
| -rw-r--r-- | runtime/autoload/dist/ft.vim | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index 973d3b028..de45faa4f 100644 --- 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" |