summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-24 20:13:26 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-24 20:13:26 +0100
commita09bee322e605c8a076fa23c3d3259495a1129d2 (patch)
treec4a6eaf3c56e212b50268170ec710e40dcb07b2b /src
parentc9f8b849b6de9661e543d0d1431e233725dd956f (diff)
downloadvim-git-a09bee322e605c8a076fa23c3d3259495a1129d2.tar.gz
patch 8.2.2041: haskell filetype not optimally recognizedv8.2.2041
Problem: Haskell filetype not optimally recognized. Solution: Recognize all *.hsc files as Haskell. (Marcin Szamotulski, closes #7354)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_filetype.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index f3f622eb4..15ba59ae9 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -204,8 +204,8 @@ let s:filename_checks = {
\ '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 19757ca05..ab2300bd4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2041,
+/**/
2040,
/**/
2039,