merges r23362 from trunk into ruby_1_9_1.

--
* test/ruby/test_rubyoptions.rb (test_indentation_check): add a test
  for indentation check.  [ruby-dev:38382]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23514 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0bfd96dc4..564c45292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  7 21:42:51 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_rubyoptions.rb (test_indentation_check): add a test
+	  for indentation check.  [ruby-dev:38382]
+
 Thu May  7 16:40:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (rb_ary_flatten_bang): returns nil if nothing changed.
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index a540c70ac..6db7ff32c 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -284,4 +284,15 @@ class TestRubyOptions < Test::Unit::TestCase
     assert_in_out_err(%w(- -#=foo), "#!ruby -s\n", [],
                       /invalid name for global variable - -# \(NameError\)/)
   end
+
+  def test_indentation_check
+    t = Tempfile.new(["test_ruby_test_rubyoption", ".rb"])
+    t.puts "begin"
+    t.puts " end"
+    t.close
+    assert_in_out_err(["-w", t.path], "", [], /:2: warning: mismatched indentations at 'end' with 'begin' at 1/)
+    assert_in_out_err(["-wr", t.path, "-e", ""], "", [], /:2: warning: mismatched indentations at 'end' with 'begin' at 1/)
+  ensure
+    t.close(true) if t
+  end
 end
diff --git a/version.h b/version.h
index 435c7a974..69c269014 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 131
+#define RUBY_PATCHLEVEL 132
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1