patch 8.2.4664: Elvish files are not recognized

Problem:    Elvish files are not recognized.
Solution:   Recognize .elv files. (Bruno Roque, closes #10058)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b70b58de8cc50ded3a90caaea936872933b58e23..7aeed626a9a56aff7127599850d45ac39657abfc 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -420,6 +420,9 @@ au BufNewFile,BufRead *.ex call dist#ft#ExCheck()
 au BufRead,BufNewFile mix.lock,*.exs setf elixir
 au BufRead,BufNewFile *.eex,*.leex setf eelixir
 
+" Elvish
+au BufRead,BufNewFile *.elv setf elvish
+
 " Euphoria 3 or 4
 au BufNewFile,BufRead *.eu,*.ew,*.exu,*.exw  call dist#ft#EuphoriaCheck()
 if has("fname_case")

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0096f5f5f7ffaf5392828adcbaa8f3f971303913..4f0dbd7d6f15531cb83fb3d725024179be2d33eb 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -168,6 +168,7 @@ let s:filename_checks = {
     \ 'eelixir': ['file.eex', 'file.leex'],
     \ 'elm': ['file.elm'],
     \ 'elmfilt': ['filter-rules'],
+    \ 'elvish': ['file.elv'],
     \ 'epuppet': ['file.epp'],
     \ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'],
     \ 'eruby': ['file.erb', 'file.rhtml'],

diff --git a/src/version.c b/src/version.c
index 72ba02c487392a9af3586aa0f3d7f00435985429..bb5fc9d8ee452798847a7f2d9ada6235384f482e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4664,
 /**/
     4663,
 /**/