[ruby-core:35485] [Backport92 - Backport #4489] [PATCH] Encodings with /-(unix|dos|mac)\Z/

Issue #4489 has been updated by James M. Lawrence.


 Yui NARUSE wrote:
 > James M. Lawrence wrote:
 >> The full patch keeps compatibility. You may wish to break it, which is
 >> fine as long as nobody blames me :)
 >
 > Yeas, your point is correct; I fixed it in r31086.
 > In the commit, I exclude only UTF8-MAC.
 > It is to allow to specify UTF-8 with CR-newline as UTF-8-MAC.
 
OK, you want to keep compatibility for utf8-mac but break
compatibility for utf-8-mac because you consider the original behavior
to be a bug. In that case you need to remove the alias.
 
Since emacs-22 treats utf-8-mac as utf-8, it would seem that ruby
indeed had an unrelated bug.
 
  diff --git a/enc/utf_8.c b/enc/utf_8.c
  index 0c44a3e..63e5f8f 100644
  --- a/enc/utf_8.c
  +++ b/enc/utf_8.c
  @@ -452,6 +452,5 @@ ENC_ALIAS("CP65001", "UTF-8")
    * Link: http://www.gnu.org/software/emacs/NEWS.23.2
    */
   ENC_REPLICATE("UTF8-MAC", "UTF-8")
  -ENC_ALIAS("UTF-8-MAC", "UTF8-MAC")
   ENC_ALIAS("UTF-8-HFS", "UTF8-MAC") /* Emacs 23.2 */
   
  diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
  index 6877afe..28f879e 100644
  --- a/ext/nkf/nkf-utf8/nkf.c
  +++ b/ext/nkf/nkf-utf8/nkf.c
  @@ -247,7 +247,6 @@ struct {
       {"UTF-8N",			UTF_8N},
       {"UTF-8-BOM",		UTF_8_BOM},
       {"UTF8-MAC",		UTF8_MAC},
  -    {"UTF-8-MAC",		UTF8_MAC},
       {"UTF-16",			UTF_16},
       {"UTF-16BE",		UTF_16BE},
       {"UTF-16BE-BOM",		UTF_16BE_BOM},
 

----------------------------------------
Backport #4489: [PATCH] Encodings with /-(unix|dos|mac)\Z/
http://redmine.ruby-lang.org/issues/4489

Author: James M. Lawrence
Status: Assigned
Priority: Normal
Assignee: Yuki Sonoda
Category: 
Target version: 


The *-dos and *-mac meta-encodings were not being recognized. utf-8-mac is a special case since it corresponds to a real encoding; its meta-encoding is utf-8-mac-mac.


-- 
http://redmine.ruby-lang.org