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

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

1 files changed, 3 insertions, 1 deletions

diff --git a/parse.y b/parse.y
index ead771a2a0..317138fc63 100644
--- a/parse.y
+++ b/parse.y
@@ -6223,7 +6223,9 @@ parser_encode_length(struct parser_params *parser, const char *name, long len)
     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;