merges r30484 from trunk into ruby_1_9_2.

--
* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
  regexp after open bracket.  [ruby-core:34183]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index fc70b4cd06..da9e82e8bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan  7 21:54:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
+	  regexp after open bracket.  [ruby-core:34183]
+
 Thu Jan  6 22:42:02 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (bigmul1_karatsuba): avoid overflow that make assertion