To: vim_dev@googlegroups.com Subject: Patch 8.2.0873 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.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) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.0872/runtime/filetype.vim 2020-05-30 13:15:11.098875009 +0200 --- runtime/filetype.vim 2020-06-01 14:38:14.798564540 +0200 *************** *** 887,897 **** " Lilo: Linux loader au BufNewFile,BufRead lilo.conf setf lilo ! " Lisp (*.el = ELisp, *.cl = Common Lisp, *.jl = librep Lisp) if has("fname_case") ! au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.jl,*.L,.emacs,.sawfishrc setf lisp else ! au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.jl,.emacs,.sawfishrc setf lisp endif " SBCL implementation of Common Lisp --- 887,898 ---- " Lilo: Linux loader au BufNewFile,BufRead lilo.conf setf lilo ! " 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,*.L,.emacs,.sawfishrc setf lisp else ! au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc setf lisp endif " SBCL implementation of Common Lisp *** ../vim-8.2.0872/src/testdir/test_filetype.vim 2020-05-30 13:15:11.098875009 +0200 --- src/testdir/test_filetype.vim 2020-06-01 14:43:21.201378750 +0200 *************** *** 252,258 **** \ 'lilo': ['lilo.conf'], \ 'limits': ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf'], \ 'liquid': ['file.liquid'], ! \ 'lisp': ['sbclrc', '.sbclrc'], \ 'lite': ['file.lite', 'file.lt'], \ 'litestep': ['/LiteStep/any/file.rc'], \ 'loginaccess': ['/etc/login.access'], --- 252,258 ---- \ 'lilo': ['lilo.conf'], \ 'limits': ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf'], \ 'liquid': ['file.liquid'], ! \ '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'], *** ../vim-8.2.0872/src/version.c 2020-06-01 14:34:22.027462262 +0200 --- src/version.c 2020-06-01 14:42:48.953503708 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 873, /**/ -- A man is incomplete until he's married ... and then he's finished! /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///