yugui	2011-07-03 21:24:18 +0900 (Sun, 03 Jul 2011)

  New Revision: 32385

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32385

  Log:
    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.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32384)
+++ ruby_1_9_2/ChangeLog	(revision 32385)
@@ -6,6 +6,14 @@
 	* 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@r...>
+
+	* 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@f...>
 
 	* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32384)
+++ ruby_1_9_2/version.h	(revision 32385)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/