patch 8.2.4715: Vagrantfile not recognized

Problem:    Vagrantfile not recognized.
Solution:   Recognize Vagrantfile as ruby. (Julien Voisin, closes #10119)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ec6ab1513a93bcd4847294cdf1df0fc6817d15d1..0c7dcae053cad9269e0314952b12c6e4ffc78f80 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2050,6 +2050,9 @@ au BufNewFile,BufRead *.vala                      setf vala
 " Vera
 au BufNewFile,BufRead *.vr,*.vri,*.vrh         setf vera
 
+" Vagrant (uses Ruby syntax)
+au BufNewFile,BufRead Vagrantfile              setf ruby
+
 " Verilog HDL
 au BufNewFile,BufRead *.v                      setf verilog
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d324c0230d0423f90c3eb55dffe58aabc1c4979a..a1cb4882709b86e8978a0076c835c7f3d377414a 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -456,7 +456,7 @@ let s:filename_checks = {
     \ 'rpl': ['file.rpl'],
     \ 'rst': ['file.rst'],
     \ 'rtf': ['file.rtf'],
-    \ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile'],
+    \ 'ruby': ['.irbrc', 'irbrc', 'file.rb', 'file.rbw', 'file.gemspec', 'file.ru', 'Gemfile', 'file.builder', 'file.rxml', 'file.rjs', 'file.rant', 'file.rake', 'rakefile', 'Rakefile', 'rantfile', 'Rantfile', 'rakefile-file', 'Rakefile-file', 'Puppetfile', 'Vagrantfile'],
     \ 'rust': ['file.rs'],
     \ 'samba': ['smb.conf'],
     \ 'sas': ['file.sas'],

diff --git a/src/version.c b/src/version.c
index efd76487a959ab9345d03536904dd804a2da8c6a..5ffcdeb54d662302c06651866a62ce01e136fbcc 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 */
+/**/
+    4715,
 /**/
     4714,
 /**/