From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 18 Jan 2019 22:14:43 +0000 (+0100)
Subject: patch 8.1.0775: matching too many files as zsh
X-Git-Tag: v8.1.0775
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bf60b300188a7a733408a21a9716362ef4e2c44;p=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.
---

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
@@ -791,6 +791,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    775,
 /**/
     774,
 /**/