merges r32067 from trunk into ruby_1_9_2.

--
* parse.y (parser_parse_string): flush delayed token.  based on a
  patch by Masaya Tarui in [ruby-dev:43762].  Bug #4544
* parse.y (yylex): revert r24557.  delayed token at the end of
  string should be flushed already by the above change.

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

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d5bb5cb45..e4f797161a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,14 @@ Mon Jun 13 23:38:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* parse.y (yylex): revert r24557.  delayed token at the end of
 	  string should be flushed already by the above change.
 
+Mon Jun 13 23:38:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_parse_string): flush delayed token.  based on a
+	  patch by Masaya Tarui in [ruby-dev:43762].  Bug #4544
+
+	* parse.y (yylex): revert r24557.  delayed token at the end of
+	  string should be flushed already by the above change.
+
 Mon Jun 13 23:05:01 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
diff --git a/version.h b/version.h
index c19c86cd48..5b168332d6 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 284
+#define RUBY_PATCHLEVEL 285
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1