Mercurial > vim
changeset 20639:3dab6fbe133c v8.2.0873
patch 8.2.0873: a .jl file can be sawfish (lisp) or Julia
Commit: https://github.com/vim/vim/commit/2891459b81a21dbd2802ef1ae106c6680f085899
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 1 14:43:59 2020 +0200
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 #6178)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 01 Jun 2020 14:45:06 +0200 |
| parents | e856aaccd7c7 |
| children | d9b8b101d506 |
| files | runtime/filetype.vim src/testdir/test_filetype.vim src/version.c |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -887,11 +887,12 @@ au BufNewFile,BufRead *.ll setf lifeli " 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
--- a/src/testdir/test_filetype.vim +++ b/src/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'],