yugui	2011-05-29 08:32:27 +0900 (Sun, 29 May 2011)

  New Revision: 31775

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

  Log:
    merges r31086 from trunk into ruby_1_9_2.
    --
    * parse.y (parser_encode_length): add exception as UTF8-MAC for
      magic comment's emacs newline specifier
      patched by James M. Lawrence [ruby-core:35476] fixes #4489

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31774)
+++ ruby_1_9_2/ChangeLog	(revision 31775)
@@ -1,3 +1,9 @@
+Thu Mar 10 21:59:37 2011  NARUSE, Yui  <naruse@r...>
+
+	* parse.y (parser_encode_length): add exception as UTF8-MAC for
+	  magic comment's emacs newline specifier
+	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
+
 Thu Mar 10 16:00:22 2011  NARUSE, Yui  <naruse@r...>
 
 	* parse.y (parser_encode_length): fix typo: the length of
@@ -4,6 +10,12 @@
 	  "-dos" and "-mac" is not 5 but 4.
 	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
 
+Thu Mar 10 16:00:22 2011  NARUSE, Yui  <naruse@r...>
+
+	* parse.y (parser_encode_length): fix typo: the length of
+	  "-dos" and "-mac" is not 5 but 4.
+	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
+
 Mon Mar  7 22:59:39 2011  Shota Fukumori  <sorah@t...>
 
 	* lib/pstore.rb: Delete variable @transaction and fix #4474. Patch by
Index: ruby_1_9_2/parse.y
===================================================================
--- ruby_1_9_2/parse.y	(revision 31774)
+++ ruby_1_9_2/parse.y	(revision 31775)
@@ -6223,7 +6223,9 @@
     if (len > 4 && name[nlen = len - 4] == '-') {
 	if (rb_memcicmp(name + nlen + 1, "dos", 3) == 0)
 	    return nlen;
-	if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0)
+	if (rb_memcicmp(name + nlen + 1, "mac", 3) == 0 &&
+	    !(len == 8 && rb_memcicmp(name, "utf8-mac", len) == 0))
+	    /* exclude UTF8-MAC because the encoding named "UTF8" doesn't exist in Ruby */
 	    return nlen;
     }
     return len;
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31774)
+++ ruby_1_9_2/version.h	(revision 31775)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 213
+#define RUBY_PATCHLEVEL 214
 #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/