diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-18 23:14:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-18 23:14:43 +0100 |
| commit | 2bf60b300188a7a733408a21a9716362ef4e2c44 (patch) | |
| tree | b73b15ef10e2cd321277b1594e6afc31c2fcf052 | |
| parent | 05a2907cde00ac3ccff01c59978f174c020cc375 (diff) | |
| download | vim-git-2bf60b300188a7a733408a21a9716362ef4e2c44.tar.gz | |
patch 8.1.0775: matching too many files as zshv8.1.0775
Problem: Matching too many files as zsh. (Danek Duvall)
Solution: Be more specific with zsh filetype patterns.
| -rw-r--r-- | runtime/filetype.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index cdfbbffeb..30ce12918 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1476,15 +1476,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 @@ -2087,9 +2088,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') @@ -2117,7 +2115,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') diff --git a/src/version.c b/src/version.c index 575f0df08..8584fceee 100644 --- a/src/version.c +++ b/src/version.c @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 775, +/**/ 774, /**/ 773, |