diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-02 23:52:41 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-04 20:52:52 -0400 |
| commit | f85bf6ec374edbfbee35be2112840e0c6d011ca2 (patch) | |
| tree | c33bd845dc34e9883c5be630a513eedadd1316e5 | |
| parent | 44531928b3512b143f6e3c958e49f99e827eb7de (diff) | |
| download | rneovim-f85bf6ec374edbfbee35be2112840e0c6d011ca2.tar.gz rneovim-f85bf6ec374edbfbee35be2112840e0c6d011ca2.tar.bz2 rneovim-f85bf6ec374edbfbee35be2112840e0c6d011ca2.zip | |
vim-patch:8.2.0873: a .jl file can be sawfish (lisp) or Julia
Problem: A .jl file can be sawfish (lisp) or Julia.
Solution: Do not recognize *.jl as lisp, since it might be Julia.
(closes vim/vim#6178)
https://github.com/vim/vim/commit/2891459b81a21dbd2802ef1ae106c6680f085899
| -rw-r--r-- | runtime/filetype.vim | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_filetype.vim | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index b29168984c..383a45b9d3 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -883,11 +883,12 @@ au BufNewFile,BufRead *.ll setf lifelines " Lilo: Linux loader au BufNewFile,BufRead lilo.conf setf lilo -" Lisp (*.el = ELisp, *.cl = Common Lisp, *.jl = librep Lisp) +" Lisp (*.el = ELisp, *.cl = Common Lisp) +" *.jl was removed, it's also used for Julia, better skip than guess wrong. if has("fname_case") - au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.jl,*.L,.emacs,.sawfishrc setf lisp + au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.L,.emacs,.sawfishrc setf lisp else - au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.jl,.emacs,.sawfishrc setf lisp + au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc setf lisp endif " SBCL implementation of Common Lisp diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim index 832f1726fb..ffd2cee80f 100644 --- a/src/nvim/testdir/test_filetype.vim +++ b/src/nvim/testdir/test_filetype.vim @@ -252,7 +252,7 @@ let s:filename_checks = { \ 'lilo': ['lilo.conf'], \ 'limits': ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf'], \ 'liquid': ['file.liquid'], - \ 'lisp': ['sbclrc', '.sbclrc'], + \ 'lisp': ['file.lsp', 'file.lisp', 'file.el', 'file.cl', '.emacs', '.sawfishrc', 'sbclrc', '.sbclrc'], \ 'lite': ['file.lite', 'file.lt'], \ 'litestep': ['/LiteStep/any/file.rc'], \ 'loginaccess': ['/etc/login.access'], |