Merge remote branch 'just3ws/Add_Vagrantfile'

* just3ws/Add_Vagrantfile: Added Vagrantfile to the list of Ruby files
myronmarston · Feb 2, 2011 · af17cbf · af17cbf
2 parents e553144 + 01b3156
commit af17cbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.markdown b/README.markdown
@@ -247,7 +247,7 @@ Janus ships with a few additional syntaxes:
 * Sass (bound to \*.sass)
 * SCSS (bound to \*.scss)
 * An improved JavaScript syntax (bound to \*.js)
-* Map Gemfile, Rakefile and Thorfile to Ruby
+* Map Gemfile, Rakefile, Vagrantfile and Thorfile to Ruby
 * Git commits (set your `EDITOR` to `mvim -f`)
 
 ## Color schemes

diff --git a/vimrc b/vimrc
@@ -66,8 +66,8 @@ endfunction
 " make uses real tabs
 au FileType make                                     set noexpandtab
 
-" Thorfile, Rakefile and Gemfile are Ruby
-au BufRead,BufNewFile {Gemfile,Rakefile,Thorfile,config.ru}    set ft=ruby
+" Thorfile, Rakefile, Vagrantfile and Gemfile are Ruby
+au BufRead,BufNewFile {Gemfile,Rakefile,Vagrantfile,Thorfile,config.ru}    set ft=ruby
 
 " md, markdown, and mk are markdown and define buffer-local preview
 au BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn} call s:setupMarkup()