diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-17 20:49:09 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-17 20:49:27 -0400 |
| commit | 14bfa0c578d8dfc3d82fe2b1ef39654bbf49b40d (patch) | |
| tree | 837587215eb7cc05d5291808d6b5e2e9397005c0 | |
| parent | fb95bb38b5e9b83dcbea663744d80439109c6d0a (diff) | |
| download | rneovim-14bfa0c578d8dfc3d82fe2b1ef39654bbf49b40d.tar.gz rneovim-14bfa0c578d8dfc3d82fe2b1ef39654bbf49b40d.tar.bz2 rneovim-14bfa0c578d8dfc3d82fe2b1ef39654bbf49b40d.zip | |
vim-patch:8.1.0775: matching too many files as zsh
Problem: Matching too many files as zsh. (Danek Duvall)
Solution: Be more specific with zsh filetype patterns.
https://github.com/vim/vim/commit/2bf60b300188a7a733408a21a9716362ef4e2c44
| -rw-r--r-- | runtime/filetype.vim | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 2e5c0c35a5..1a08f5675f 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1472,15 +1472,16 @@ au BufNewFile,BufRead *.install \ call dist#ft#SetFileTypeSH("bash") | \ endif -" tcsh scripts +" tcsh scripts (patterns ending in a star further below) au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login call dist#ft#SetFileTypeShell("tcsh") " csh scripts, but might also be tcsh scripts (on some systems csh is tcsh) +" (patterns ending in a start further below) au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias call dist#ft#CSH() -" Z-Shell script +" Z-Shell script (patterns ending in a star further below) au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks setf zsh -au BufNewFile,BufRead .zsh,.zlog,.zcompdump call s:StarSetf('zsh') +au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh au BufNewFile,BufRead *.zsh setf zsh " Scheme @@ -2086,9 +2087,6 @@ au BufNewFile,BufRead .tcshrc* call dist#ft#SetFileTypeShell("tcsh") " csh scripts ending in a star au BufNewFile,BufRead .login*,.cshrc* call dist#ft#CSH() -" Z-Shell script ending in a star -au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh') - " Vim script au BufNewFile,BufRead *vimrc* call s:StarSetf('vim') @@ -2116,7 +2114,8 @@ au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd') " yum conf (close enough to dosini) au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini') -" Z-Shell script +" Z-Shell script ending in a star +au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh') au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh') |