• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révision7160e85d62ffecb7bc0cfbc9c749f8c6172ebd56 (tree)
l'heure2020-11-25 04:15:03
AuteurBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Message de Log

patch 8.2.2041: haskell filetype not optimally recognized

Commit: https://github.com/vim/vim/commit/a09bee322e605c8a076fa23c3d3259495a1129d2
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Nov 24 20:13:26 2020 +0100

patch 8.2.2041: haskell filetype not optimally recognized
Problem: Haskell filetype not optimally recognized.
Solution: Recognize all *.hsc files as Haskell. (Marcin Szamotulski,
closes #7354)

Change Summary

Modification

diff -r 6a48b29a5fb5 -r 7160e85d62ff runtime/filetype.vim
--- a/runtime/filetype.vim Tue Nov 24 19:45:04 2020 +0100
+++ b/runtime/filetype.vim Tue Nov 24 20:15:03 2020 +0100
@@ -697,15 +697,9 @@
697697
698698 " Hamster Classic | Playground files
699699 au BufNewFile,BufRead *.hsm setf hamster
700-au BufNewFile,BufRead *.hsc
701- \ if match(join(getline(1,10), "\n"), '\%(^\|\n\)\s*\%({-#\_s*LANGUAGE\>\|\<module\>\)') != -1 |
702- \ setf haskell |
703- \ else |
704- \ setf hamster |
705- \ endif
706700
707701 " Haskell
708-au BufNewFile,BufRead *.hs,*.hs-boot setf haskell
702+au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot setf haskell
709703 au BufNewFile,BufRead *.lhs setf lhaskell
710704 au BufNewFile,BufRead *.chs setf chaskell
711705 au BufNewFile,BufRead cabal.project setf cabalproject
diff -r 6a48b29a5fb5 -r 7160e85d62ff src/testdir/test_filetype.vim
--- a/src/testdir/test_filetype.vim Tue Nov 24 19:45:04 2020 +0100
+++ b/src/testdir/test_filetype.vim Tue Nov 24 20:15:03 2020 +0100
@@ -204,8 +204,8 @@
204204 \ 'gsp': ['file.gsp'],
205205 \ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'],
206206 \ 'haml': ['file.haml'],
207- \ 'hamster': ['file.hsc', 'file.hsm'],
208- \ 'haskell': ['file.hs', 'file.hs-boot'],
207+ \ 'hamster': ['file.hsm'],
208+ \ 'haskell': ['file.hs', 'file.hsc', 'file.hs-boot'],
209209 \ 'haste': ['file.ht'],
210210 \ 'hastepreproc': ['file.htpp'],
211211 \ 'hb': ['file.hb'],
diff -r 6a48b29a5fb5 -r 7160e85d62ff src/version.c
--- a/src/version.c Tue Nov 24 19:45:04 2020 +0100
+++ b/src/version.c Tue Nov 24 20:15:03 2020 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 2041,
755+/**/
754756 2040,
755757 /**/
756758 2039,
Afficher sur ancien navigateur de dépôt.