Merge branch 'master' into fix-def-indentation

.gitignore

@@ -0,0 +1 @@
+doc/tags

bin/vim-ruby-install.rb

@@ -431,6 +431,7 @@ def path
     puts
     puts "Target directory '#{target_dir}' does not exist."
     response = Env.ask_user "Do you want to create it? [Yn] "
+    response = "y" if response.empty?
     if response.strip =~ /^y(es)?$/i
       FileUtils.mkdir_p(target_dir, :verbose => true)
     else

etc/examples/indent/blocks.rb

@@ -0,0 +1,25 @@
+proc do |(a, b)|
+  puts a
+  puts b
+end
+
+proc do |foo, (a, b), bar|
+  puts a
+  puts b
+end
+
+define_method "something" do |param|
+  if param == 42
+    do_something
+  else
+    do_something_else
+  end
+end
+
+def foo
+  opts.on('--coordinator host=HOST[,port=PORT]',
+          'Specify the HOST and the PORT of the coordinator') do |str|
+    h = sub_opts_to_hash(str)
+    puts h
+  end
+end

etc/examples/indent/nested_hashes.rb

@@ -35,7 +35,7 @@ class Foo
   foo,
     bar = {
     :bar => {
-      :foo { 'bar' => 'baz' },
+      :foo => { 'bar' => 'baz' },
       :one => 'two',
       :three => 'four'
     }
@@ -46,8 +46,8 @@ class Foo
   var.
     func1(:param => 'value') {
     func1_5(:param => 'value')
-  var.func2(:param => 'value') {
-    puts "test"
-  }
+    var.func2(:param => 'value') {
+      puts "test"
+    }
   }
 end