From f1b2fb67061ee2fa15a04e8777bcb55790a9dd5c Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 10 Mar 2011 13:07:03 +0000 Subject: * 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/trunk@31086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index b1408d8fd8..50aafbf876 100644 --- a/parse.y +++ b/parse.y @@ -6233,7 +6233,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; -- cgit v1.2.3