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)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e12c8ee770db2eda07b4de99de61f49b07b7b22f..8616a71f24b5ec8f7d0dd7a74dc2aace41fe0262 100644 (file)
--- 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 c47a6b822dd27d484f2e6e1fbfebd2f22c683455..832446bb9f0b4f0bed1777b80ce4277f9ab28ae3 100644 (file)
--- 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 ec8cda77d6f80fdf779cc3fbc644b12d7a5ab6e2..df3640829bde8edc03f0c8895cc77fb93035ac4e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    873,
 /**/
     872,
 /**/