diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-01 14:43:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-01 14:43:59 +0200 |
| commit | 2891459b81a21dbd2802ef1ae106c6680f085899 (patch) | |
| tree | b2e1aa33f595db8878d0114058b9e2eb4e0ebea0 | |
| parent | f15c8b6eb32fcfea88fd9ca42ef87bbee2c8fe2b (diff) | |
patch 8.2.0873: a .jl file can be sawfish (lisp) or Juliav8.2.0873
Problem: A .jl file can be sawfish (lisp) or Julia.
Solution: Do not recognize *.jl as lisp, since it might be Julia.
(closes #6178)
| -rw-r--r-- | runtime/filetype.vim | 7 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index e12c8ee770..8616a71f24 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -887,11 +887,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index c47a6b822d..832446bb9f 100644 --- 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'], diff --git a/src/version.c b/src/version.c index ec8cda77d6..df3640829b 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 873, +/**/ 872, /**/ 871, |