diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-11-27 22:06:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-27 22:06:31 -0800 |
| commit | 86c4a87fe9a6ce7d5f8fb9de76490b1a0fa64538 (patch) | |
| tree | 312f751db4acd790b0b61f94a1d1a9de732062a7 /runtime | |
| parent | 33beeed4d9c2bda79d48a58ec10e8b05e7de5122 (diff) | |
| parent | 585e3ddfc785abfd0022af4f9c84f13e24c41782 (diff) | |
| download | rneovim-86c4a87fe9a6ce7d5f8fb9de76490b1a0fa64538.tar.gz rneovim-86c4a87fe9a6ce7d5f8fb9de76490b1a0fa64538.tar.bz2 rneovim-86c4a87fe9a6ce7d5f8fb9de76490b1a0fa64538.zip | |
Merge #11467 from janlazo/vim-8.1.2345
vim-patch:8.1.{1252,1253,1254,1268,2345,2348,2349}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/filetype.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 8ce45b6a50..e27d234a96 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2019 Aug 26 +" Last Change: 2019 Nov 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -796,8 +796,8 @@ au BufNewFile,BufRead *.java,*.jav setf java " JavaCC au BufNewFile,BufRead *.jj,*.jjt setf javacc -" JavaScript, ECMAScript -au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs setf javascript +" 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 |