To: vim_dev@googlegroups.com Subject: Patch 8.2.2041 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2041 Problem: Haskell filetype not optimally recognized. Solution: Recognize all *.hsc files as Haskell. (Marcin Szamotulski, closes #7354) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.2040/runtime/filetype.vim 2020-11-22 15:51:18.253265207 +0100 --- runtime/filetype.vim 2020-11-24 20:09:29.143121516 +0100 *************** *** 697,711 **** " Hamster Classic | Playground files au BufNewFile,BufRead *.hsm setf hamster - au BufNewFile,BufRead *.hsc - \ if match(join(getline(1,10), "\n"), '\%(^\|\n\)\s*\%({-#\_s*LANGUAGE\>\|\\)') != -1 | - \ setf haskell | - \ else | - \ setf hamster | - \ endif " Haskell ! au BufNewFile,BufRead *.hs,*.hs-boot setf haskell au BufNewFile,BufRead *.lhs setf lhaskell au BufNewFile,BufRead *.chs setf chaskell au BufNewFile,BufRead cabal.project setf cabalproject --- 697,705 ---- " Hamster Classic | Playground files au BufNewFile,BufRead *.hsm setf hamster " Haskell ! au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot setf haskell au BufNewFile,BufRead *.lhs setf lhaskell au BufNewFile,BufRead *.chs setf chaskell au BufNewFile,BufRead cabal.project setf cabalproject *** ../vim-8.2.2040/src/testdir/test_filetype.vim 2020-11-22 15:51:18.257265193 +0100 --- src/testdir/test_filetype.vim 2020-11-24 20:09:29.143121516 +0100 *************** *** 204,211 **** \ 'gsp': ['file.gsp'], \ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'], \ 'haml': ['file.haml'], ! \ 'hamster': ['file.hsc', 'file.hsm'], ! \ 'haskell': ['file.hs', 'file.hs-boot'], \ 'haste': ['file.ht'], \ 'hastepreproc': ['file.htpp'], \ 'hb': ['file.hb'], --- 204,211 ---- \ 'gsp': ['file.gsp'], \ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'], \ 'haml': ['file.haml'], ! \ 'hamster': ['file.hsm'], ! \ 'haskell': ['file.hs', 'file.hsc', 'file.hs-boot'], \ 'haste': ['file.ht'], \ 'hastepreproc': ['file.htpp'], \ 'hb': ['file.hb'], *** ../vim-8.2.2040/src/version.c 2020-11-24 19:36:12.718255326 +0100 --- src/version.c 2020-11-24 20:11:25.994781052 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2041, /**/ -- ** Hello and Welcome to the Psychiatric Hotline ** If you are obsessive-compulsive, please press 1 repeatedly. If you are co-dependent, please ask someone to press 2. If you have multiple personalities, please press 3, 4, 5 and 6. If you are paranoid-delusional, we know who you are and what you want - just stay on the line so we can trace the call. If you are schizophrenic, listen carefully and a little voice will tell you which number to press next. If you are manic-depressive, it doesn't matter which number you press - no one will answer. If you suffer from panic attacks, push every button you can find. If you are sane, please hold on - we have the rest of humanity on the other line and they desparately want to ask you a few questions. /// 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 ///