patch 8.2.4826: .cshtml files are not recognized

Problem:    .cshtml files are not recognized.
Solution:   Use html filetype for .cshtml files. (Julien Voisin, closes #10212)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9dcca898c7a9d0cd4c95e6fe2c788738cf94fe05..f69ede4883f4007011857253d82bece41f241322 100644 (file)
--- 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 888ff7a92b6a27b45097b070aa0d76b4e3704dd8..75674da72f6b2581227fc3eb71b56ffa58aeb659 100644 (file)
--- 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 daca23c2c6e8f5b7980391e195eb671c59ad0f84..8017f830b8d23ba92aa45838a55693c564de6fde 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4826,
 /**/
     4825,
 /**/