aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--file.c2
-rw-r--r--test/ruby/test_string.rb8
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c182b32f9..6bfc649416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 23 16:03:26 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * file.c: fix indent style. [fix GH-977]
+ * test/ruby/test_string.rb: indent. [fix GH-975]
+ [ci skip] These patches are contributed from @yui-knk
+
Fri Oct 23 15:46:09 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* string.c: Added method signature to include hash. It's inconsistency
diff --git a/file.c b/file.c
index 616f68f984..e31b3eeadc 100644
--- a/file.c
+++ b/file.c
@@ -4259,7 +4259,7 @@ ruby_enc_find_extname(const char *name, long *len, rb_encoding *enc)
* File.extname("test.rb") #=> ".rb"
* File.extname("a/b/d/test.rb") #=> ".rb"
* File.extname(".a/b/d/test.rb") #=> ".rb"
- * File.extname("foo.") #=> ""
+ * File.extname("foo.") #=> ""
* File.extname("test") #=> ""
* File.extname(".profile") #=> ""
* File.extname(".profile.sh") #=> ".sh"
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index fba8d51b35..ce21db9815 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -281,10 +281,10 @@ class TestString < Test::Unit::TestCase
def casetest(a, b, rev=false)
msg = proc {"#{a} should#{' not' if rev} match #{b}"}
case a
- when b
- assert(!rev, msg)
- else
- assert(rev, msg)
+ when b
+ assert(!rev, msg)
+ else
+ assert(rev, msg)
end
end