To: vim_dev@googlegroups.com Subject: Patch 8.1.2345 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2345 Problem: .cjs files are not recognized as Javascript. Solution: Add the *.cjs pattern. (closes #5268) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.1.2344/runtime/filetype.vim 2019-10-19 14:10:15.496046067 +0200 --- runtime/filetype.vim 2019-11-26 13:39:25.084861441 +0100 *************** *** 1,7 **** " Vim support file to detect file types " " Maintainer: Bram Moolenaar ! " Last Change: 2019 Jul 27 " Listen very carefully, I will say this only once if exists("did_load_filetypes") --- 1,7 ---- " Vim support file to detect file types " " Maintainer: Bram Moolenaar ! " Last Change: 2019 Nov 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") *************** *** 384,391 **** " CUDA Cumpute Unified Device Architecture au BufNewFile,BufRead *.cu,*.cuh setf cuda ! " Dockerfile ! au BufNewFile,BufRead Dockerfile,*.Dockerfile setf dockerfile " WildPackets EtherPeek Decoder au BufNewFile,BufRead *.dcd setf dcd --- 384,391 ---- " CUDA Cumpute Unified Device Architecture au BufNewFile,BufRead *.cu,*.cuh setf cuda ! " Dockerfilb; Podman uses the same syntax with name Containerfile ! au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile setf dockerfile " WildPackets EtherPeek Decoder au BufNewFile,BufRead *.dcd setf dcd *************** *** 800,807 **** " JavaCC au BufNewFile,BufRead *.jj,*.jjt setf javacc ! " JavaScript, ECMAScript ! au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs setf javascript " JavaScript with React au BufNewFile,BufRead *.jsx setf javascriptreact --- 800,807 ---- " JavaCC au BufNewFile,BufRead *.jj,*.jjt setf javacc ! " JavaScript, ECMAScript, ES module script, CommonJS script ! au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs,*.cjs setf javascript " JavaScript with React au BufNewFile,BufRead *.jsx setf javascriptreact *** ../vim-8.1.2344/src/testdir/test_filetype.vim 2019-10-19 14:10:15.496046067 +0200 --- src/testdir/test_filetype.vim 2019-11-26 13:41:08.563084692 +0100 *************** *** 136,142 **** \ 'diff': ['file.diff', 'file.rej'], \ 'dircolors': ['.dir_colors', '.dircolors', '/etc/DIR_COLORS'], \ 'dnsmasq': ['/etc/dnsmasq.conf'], ! \ 'dockerfile': ['Dockerfile', 'file.Dockerfile'], \ 'dosbatch': ['file.bat', 'file.sys'], \ 'dosini': ['.editorconfig', '/etc/yum.conf', 'file.ini'], \ 'dot': ['file.dot'], --- 136,142 ---- \ 'diff': ['file.diff', 'file.rej'], \ 'dircolors': ['.dir_colors', '.dircolors', '/etc/DIR_COLORS'], \ 'dnsmasq': ['/etc/dnsmasq.conf'], ! \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'], \ 'dosbatch': ['file.bat', 'file.sys'], \ 'dosini': ['.editorconfig', '/etc/yum.conf', 'file.ini'], \ 'dot': ['file.dot'], *************** *** 223,229 **** \ 'jam': ['file.jpl', 'file.jpr'], \ 'java': ['file.java', 'file.jav'], \ 'javacc': ['file.jj', 'file.jjt'], ! \ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs'], \ 'javascriptreact': ['file.jsx'], \ 'jess': ['file.clp'], \ 'jgraph': ['file.jgr'], --- 223,229 ---- \ 'jam': ['file.jpl', 'file.jpr'], \ 'java': ['file.java', 'file.jav'], \ 'javacc': ['file.jj', 'file.jjt'], ! \ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'], \ 'javascriptreact': ['file.jsx'], \ 'jess': ['file.clp'], \ 'jgraph': ['file.jgr'], *** ../vim-8.1.2344/src/version.c 2019-11-26 13:28:57.652905893 +0100 --- src/version.c 2019-11-26 13:41:05.635131637 +0100 *************** *** 739,740 **** --- 739,742 ---- { /* Add new patch number below this line */ + /**/ + 2345, /**/ -- I have a watch cat! Just break in and she'll watch. /// 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 ///