diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-18 01:54:45 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-18 01:54:45 -0400 |
| commit | 40cc5ba0e23c919294dd07dfec40d387324f345f (patch) | |
| tree | 983555a2937052340febcfd2b9d858afe76b4844 | |
| parent | ca280c28b464239de85152a2d1230bfc678f7358 (diff) | |
| parent | 946807898be444e824afeac548ab04ba3b2466ba (diff) | |
| download | rneovim-40cc5ba0e23c919294dd07dfec40d387324f345f.tar.gz rneovim-40cc5ba0e23c919294dd07dfec40d387324f345f.tar.bz2 rneovim-40cc5ba0e23c919294dd07dfec40d387324f345f.zip | |
Merge pull request #4595 from dbarnett/vim-fc39ec
vim-patch:fc39ec (runtime/filetype.vim changes)
| -rw-r--r-- | runtime/filetype.vim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 9b3666b9c1..4b1767dbbc 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2015 Jun 06 +" Last Change: 2015 Aug 11 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1164,7 +1164,7 @@ func! s:FTm() let n = 1 while n < 10 let line = getline(n) - if line =~ '^\s*\(#\s*\(include\|import\)\>\|/\*\|//\)' + if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\|//\)' setf objc return endif @@ -1332,7 +1332,7 @@ func! s:FTmm() let n = 1 while n < 10 let line = getline(n) - if line =~ '^\s*\(#\s*\(include\|import\)\>\|/\*\)' + if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)' setf objcpp return endif @@ -1855,7 +1855,7 @@ au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog') " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc. " Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts -au BufNewFile,BufRead .bashrc*,bashrc,bash.bashrc,.bash_profile*,.bash_logout*,.bash_aliases*,*.bash,*.ebuild,PKGBUILD* call SetFileTypeSH("bash") +au BufNewFile,BufRead .bashrc*,bashrc,bash.bashrc,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass call SetFileTypeSH("bash") au BufNewFile,BufRead .kshrc*,*.ksh call SetFileTypeSH("ksh") au BufNewFile,BufRead */etc/profile,.profile*,*.sh,*.env call SetFileTypeSH(getline(1)) |