To: vim_dev@googlegroups.com Subject: Patch 8.2.2392 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2392 Problem: Fennel filetype not recognized. Solution: Detect with pattern and hashbang. (Chinmay Dalal, closes #7729) Files: runtime/filetype.vim, runtime/scripts.vim, src/testdir/test_filetype.vim *** ../vim-8.2.2391/runtime/filetype.vim 2021-01-21 14:45:08.914738378 +0100 --- runtime/filetype.vim 2021-01-22 20:49:32.519458724 +0100 *************** *** 589,594 **** --- 589,597 ---- " Factor au BufNewFile,BufRead *.factor setf factor + " Fennel + autocmd BufRead,BufNewFile *.fnl setf fennel + " Fetchmail RC file au BufNewFile,BufRead .fetchmailrc setf fetchmail *** ../vim-8.2.2391/runtime/scripts.vim 2021-01-12 17:42:20.949763884 +0100 --- runtime/scripts.vim 2021-01-22 20:49:32.523458713 +0100 *************** *** 150,156 **** elseif s:name =~# 'ocaml' set ft=ocaml ! " Awk scripts elseif s:name =~# 'awk\>' set ft=awk --- 150,156 ---- elseif s:name =~# 'ocaml' set ft=ocaml ! " Awk scripts; also finds "gawk" elseif s:name =~# 'awk\>' set ft=awk *************** *** 186,191 **** --- 186,195 ---- elseif s:name =~# 'instantfpc\>' set ft=pascal + " Fennel + elseif s:name =~# 'fennel\>' + set ft=fennel + endif unlet s:name *** ../vim-8.2.2391/src/testdir/test_filetype.vim 2021-01-21 14:45:08.914738378 +0100 --- src/testdir/test_filetype.vim 2021-01-22 20:49:32.523458713 +0100 *************** *** 174,179 **** --- 174,180 ---- \ 'factor': ['file.factor'], \ 'falcon': ['file.fal'], \ 'fan': ['file.fan', 'file.fwt'], + \ 'fennel': ['file.fnl'], \ 'fetchmail': ['.fetchmailrc'], \ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'], \ 'focexec': ['file.fex', 'file.focexec'], *************** *** 639,644 **** --- 640,646 ---- \ ['// -*- C++ -*-']], \ 'yaml': [['%YAML 1.2']], \ 'pascal': [['#!/path/instantfpc']], + \ 'fennel': [['#!/path/fennel']], \ } " Various forms of "env" optional arguments. *** ../vim-8.2.2391/src/version.c 2021-01-22 20:46:22.775906736 +0100 --- src/version.c 2021-01-22 20:51:36.731166724 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2392, /**/ -- "You mean there really is an answer?" "Yes! But you're not going to like it!" "Oh do please tell us!" "You're really not going to like it!" "but we MUST know - tell us" "Alright, the answer is...." "yes..." "... is ..." "yes... come on!" "is 42!" (Douglas Adams - The Hitchhiker's Guide to the Galaxy) /// 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 ///