2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 411fa43e29..52cbe4ea63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 28 11:38:07 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string): the byte after ``\'' may be a part of
+	  multibyte character, so pushback it. [ruby-list:46416]
+
 Mon Sep 28 10:06:38 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* stringio/stringio.c (strio_read): set ASCII-8BIT encoding
diff --git a/parse.y b/parse.y
index cb7a13eb5c..e325c5c729 100644
--- a/parse.y
+++ b/parse.y
@@ -5737,6 +5737,8 @@ parser_tokadd_string(struct parser_params *parser,
 		}
 		else if (c != term && !(paren && c == paren)) {
 		    tokadd('\\');
+		    pushback(c);
+		    continue;
 		}
 	    }
 	}