comparison runtime/filetype.vim @ 15535:45a159f62dd0 v8.1.0775

patch 8.1.0775: matching too many files as zsh commit https://github.com/vim/vim/commit/2bf60b300188a7a733408a21a9716362ef4e2c44 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 18 23:14:43 2019 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Fri, 18 Jan 2019 23:15:05 +0100
parents 963dd629d19a
children 7cfe57329284
comparison
equal deleted inserted replaced
15534:24b6933ab216 15535:45a159f62dd0
1474 \ setf php | 1474 \ setf php |
1475 \ else | 1475 \ else |
1476 \ call dist#ft#SetFileTypeSH("bash") | 1476 \ call dist#ft#SetFileTypeSH("bash") |
1477 \ endif 1477 \ endif
1478 1478
1479 " tcsh scripts 1479 " tcsh scripts (patterns ending in a star further below)
1480 au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login call dist#ft#SetFileTypeShell("tcsh") 1480 au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login call dist#ft#SetFileTypeShell("tcsh")
1481 1481
1482 " csh scripts, but might also be tcsh scripts (on some systems csh is tcsh) 1482 " csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
1483 " (patterns ending in a start further below)
1483 au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias call dist#ft#CSH() 1484 au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias call dist#ft#CSH()
1484 1485
1485 " Z-Shell script 1486 " Z-Shell script (patterns ending in a star further below)
1486 au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks setf zsh 1487 au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks setf zsh
1487 au BufNewFile,BufRead .zsh,.zlog,.zcompdump call s:StarSetf('zsh') 1488 au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
1488 au BufNewFile,BufRead *.zsh setf zsh 1489 au BufNewFile,BufRead *.zsh setf zsh
1489 1490
1490 " Scheme 1491 " Scheme
1491 au BufNewFile,BufRead *.scm,*.ss,*.rkt setf scheme 1492 au BufNewFile,BufRead *.scm,*.ss,*.rkt setf scheme
1492 1493
2085 au BufNewFile,BufRead .tcshrc* call dist#ft#SetFileTypeShell("tcsh") 2086 au BufNewFile,BufRead .tcshrc* call dist#ft#SetFileTypeShell("tcsh")
2086 2087
2087 " csh scripts ending in a star 2088 " csh scripts ending in a star
2088 au BufNewFile,BufRead .login*,.cshrc* call dist#ft#CSH() 2089 au BufNewFile,BufRead .login*,.cshrc* call dist#ft#CSH()
2089 2090
2090 " Z-Shell script ending in a star
2091 au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh')
2092
2093 " Vim script 2091 " Vim script
2094 au BufNewFile,BufRead *vimrc* call s:StarSetf('vim') 2092 au BufNewFile,BufRead *vimrc* call s:StarSetf('vim')
2095 2093
2096 " Subversion commit file 2094 " Subversion commit file
2097 au BufNewFile,BufRead svn-commit*.tmp setf svn 2095 au BufNewFile,BufRead svn-commit*.tmp setf svn
2115 au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd') 2113 au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd')
2116 2114
2117 " yum conf (close enough to dosini) 2115 " yum conf (close enough to dosini)
2118 au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini') 2116 au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
2119 2117
2120 " Z-Shell script 2118 " Z-Shell script ending in a star
2119 au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh')
2121 au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh') 2120 au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
2122 2121
2123 2122
2124 " Plain text files, needs to be far down to not override others. This avoids 2123 " Plain text files, needs to be far down to not override others. This avoids
2125 " the "conf" type being used if there is a line starting with '#'. 2124 " the "conf" type being used if there is a line starting with '#'.