summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Voisin <jvoisin@google.com>2022-04-08 19:55:39 +0100
committerBram Moolenaar <Bram@vim.org>2022-04-08 19:55:39 +0100
commit5e1792270a072a96157e5d5e1d6a97414e26d0bf (patch)
treef38f81d11f15dbda22dba07bb137c927485762ca
parentcbaff5e06ec525d31dc44093125c42029e01d508 (diff)
patch 8.2.4715: Vagrantfile not recognizedv8.2.4715
Problem: Vagrantfile not recognized. Solution: Recognize Vagrantfile as ruby. (Julien Voisin, closes #10119)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ec6ab1513a..0c7dcae053 100644
--- 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 d324c0230d..a1cb488270 100644
--- 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 efd76487a9..5ffcdeb54d 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 */
/**/
+ 4715,
+/**/
4714,
/**/
4713,