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)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 35b73f9..3073c9a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -697,15 +697,9 @@
" 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\>\|\<module\>\)') != -1 |
- \ setf haskell |
- \ else |
- \ setf hamster |
- \ endif
" Haskell
-au BufNewFile,BufRead *.hs,*.hs-boot setf 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
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index f3f622e..15ba59a 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -204,8 +204,8 @@
\ 'gsp': ['file.gsp'],
\ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'],
\ 'haml': ['file.haml'],
- \ 'hamster': ['file.hsc', 'file.hsm'],
- \ 'haskell': ['file.hs', 'file.hs-boot'],
+ \ 'hamster': ['file.hsm'],
+ \ 'haskell': ['file.hs', 'file.hsc', 'file.hs-boot'],
\ 'haste': ['file.ht'],
\ 'hastepreproc': ['file.htpp'],
\ 'hb': ['file.hb'],
diff --git a/src/version.c b/src/version.c
index 19757ca..ab2300b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2041,
+/**/
2040,
/**/
2039,