3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c7074d2cc..07203cb231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov  3 07:47:25 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
+	  regex options.  a patch from Heesob Park in [ruby-core:32988].
+
 Sat Oct 30 06:32:52 2010  Tanaka Akira  <akr@fsij.org>
 
 	* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 76e3ebac44..d677e42eef 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -1068,7 +1068,7 @@ class RubyLex
 	end
       end
       if @ltype == "/"
-	if peek(0) =~ /i|m|x|o|e|s|u|n/
+       while peek(0) =~ /i|m|x|o|e|s|u|n/
 	  getc
 	end
       end
diff --git a/version.h b/version.h
index 55af1f7d52..b14b6789f8 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 85
+#define RUBY_PATCHLEVEL 86
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1