To: vim_dev@googlegroups.com Subject: Patch 8.2.1409 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1409 Problem: Nmpmrc and php.ini filetypes not recognized. Solution: Add filetype detection. (Doug Kearns) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.1408/runtime/filetype.vim 2020-07-25 16:53:07.938737495 +0200 --- runtime/filetype.vim 2020-08-09 19:27:06.234897428 +0200 *************** *** 240,246 **** au BufNewFile,BufRead *bsd,*.bsdl setf bsdl " Bazel (http://bazel.io) ! autocmd BufRead,BufNewFile *.bzl,WORKSPACE,BUILD.bazel setf bzl if has("fname_case") " There is another check for BUILD further below. autocmd BufRead,BufNewFile BUILD setf bzl --- 240,246 ---- au BufNewFile,BufRead *bsd,*.bsdl setf bsdl " Bazel (http://bazel.io) ! autocmd BufRead,BufNewFile *.bzl,WORKSPACE,BUILD.bazel setf bzl if has("fname_case") " There is another check for BUILD further below. autocmd BufRead,BufNewFile BUILD setf bzl *************** *** 628,635 **** au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom " Git ! au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit ! au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig setf gitconfig au BufNewFile,BufRead */.config/git/config setf gitconfig au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig if !empty($XDG_CONFIG_HOME) --- 628,635 ---- au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom " Git ! au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit ! au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig setf gitconfig au BufNewFile,BufRead */.config/git/config setf gitconfig au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig if !empty($XDG_CONFIG_HOME) *************** *** 773,783 **** au BufNewFile,BufRead */etc/initng/*/*.i,*.ii setf initng " Innovation Data Processing ! au BufRead,BufNewFile upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c setf upstreamdat ! au BufRead,BufNewFile fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c setf upstreamlog au BufRead,BufNewFile upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c setf upstreaminstalllog ! au BufRead,BufNewFile usserver.log\c,usserver.*.log\c,*.usserver.log\c setf usserverlog ! au BufRead,BufNewFile usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c setf usw2kagtlog " Ipfilter au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules setf ipfilter --- 773,783 ---- au BufNewFile,BufRead */etc/initng/*/*.i,*.ii setf initng " Innovation Data Processing ! au BufRead,BufNewFile upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c setf upstreamdat ! au BufRead,BufNewFile fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c setf upstreamlog au BufRead,BufNewFile upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c setf upstreaminstalllog ! au BufRead,BufNewFile usserver.log\c,usserver.*.log\c,*.usserver.log\c setf usserverlog ! au BufRead,BufNewFile usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c setf usw2kagtlog " Ipfilter au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules setf ipfilter *************** *** 1076,1082 **** au BufRead,BufNewfile *.n1ql,*.nql setf n1ql " Nano ! au BufNewFile,BufRead */etc/nanorc,*.nanorc setf nanorc " Nastran input/DMAP "au BufNewFile,BufRead *.dat setf nastran --- 1076,1082 ---- au BufRead,BufNewfile *.n1ql,*.nql setf n1ql " Nano ! au BufNewFile,BufRead */etc/nanorc,*.nanorc setf nanorc " Nastran input/DMAP "au BufNewFile,BufRead *.dat setf nastran *************** *** 1093,1098 **** --- 1093,1101 ---- " Ninja file au BufNewFile,BufRead *.ninja setf ninja + " NPM RC file + au BufNewFile,BufRead npmrc,.npmrc setf dosini + " Novell netware batch files au BufNewFile,BufRead *.ncf setf ncf *************** *** 1168,1174 **** au BufNewFile,BufRead *.pdf setf pdf " PCMK - HAE - crm configure edit ! au BufNewFile,BufRead *.pcmk setf pcmk " Perl if has("fname_case") --- 1171,1177 ---- au BufNewFile,BufRead *.pdf setf pdf " PCMK - HAE - crm configure edit ! au BufNewFile,BufRead *.pcmk setf pcmk " Perl if has("fname_case") *************** *** 1199,1204 **** --- 1202,1210 ---- " Also .ctp for Cake template file au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp setf php + " PHP config + au BufNewFile,BufRead php.ini,php.ini-* setf dosini + " Pike and Cmod au BufNewFile,BufRead *.pike,*.pmod setf pike au BufNewFile,BufRead *.cmod setf cmod *************** *** 2079,2085 **** au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom') " Git ! au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/* call s:StarSetf('gitconfig') " Gitolite au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite') --- 2085,2091 ---- au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom') " Git ! au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/* call s:StarSetf('gitconfig') " Gitolite au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite') *** ../vim-8.2.1408/src/testdir/test_filetype.vim 2020-07-25 16:53:07.938737495 +0200 --- src/testdir/test_filetype.vim 2020-08-09 19:30:13.570123071 +0200 *************** *** 140,146 **** \ 'dnsmasq': ['/etc/dnsmasq.conf'], \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'], \ 'dosbatch': ['file.bat', 'file.sys'], ! \ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini'], \ 'dot': ['file.dot', 'file.gv'], \ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe'], \ 'dsl': ['file.dsl'], --- 140,146 ---- \ 'dnsmasq': ['/etc/dnsmasq.conf'], \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'], \ 'dosbatch': ['file.bat', 'file.sys'], ! \ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5'], \ 'dot': ['file.dot', 'file.gv'], \ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe'], \ 'dsl': ['file.dsl'], *** ../vim-8.2.1408/src/version.c 2020-08-09 19:02:46.281077049 +0200 --- src/version.c 2020-08-09 19:28:19.086593698 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1409, /**/ -- hundred-and-one symptoms of being an internet addict: 167. You have more than 200 websites bookmarked. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///