summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjvoisin <julien.voisin@dustri.org>2022-04-25 17:40:56 +0100
committerBram Moolenaar <Bram@vim.org>2022-04-25 17:40:56 +0100
commit1f435dafff2452e0b55d1ca457ce7402e526e92a (patch)
tree35d92c9af79bb931d7007a6c033e7c04ae1d298b
parent09661203ecefbee6a6f09438afcff1843e9dbfb4 (diff)
downloadvim-git-1f435dafff2452e0b55d1ca457ce7402e526e92a.tar.gz
patch 8.2.4826: .cshtml files are not recognizedv8.2.4826
Problem: .cshtml files are not recognized. Solution: Use html filetype for .cshtml files. (Julien Voisin, closes #10212)
-rw-r--r--runtime/filetype.vim1
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9dcca898c..f69ede488 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -821,6 +821,7 @@ au BufNewFile,BufRead *.t.html setf tilde
" HTML (.shtml and .stm for server side)
au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm call dist#ft#FThtml()
+au BufNewFile,BufRead *.cshtml setf html
" HTML with Ruby - eRuby
au BufNewFile,BufRead *.erb,*.rhtml setf eruby
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 888ff7a92..75674da72 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -258,6 +258,7 @@ let s:filename_checks = {
\ 'rnoweb': ['file.rnw', 'file.snw'],
\ 'rrst': ['file.rrst', 'file.srst'],
\ 'template': ['file.tmpl'],
+ \ 'html': ['file.html', 'file.htm', 'file.cshtml'],
\ 'htmlm4': ['file.html.m4'],
\ 'httest': ['file.htt', 'file.htb'],
\ 'ibasic': ['file.iba', 'file.ibi'],
diff --git a/src/version.c b/src/version.c
index daca23c2c..8017f830b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4826,
+/**/
4825,
/**/
4824,