* parse.y (string_content): turn off NODE_NEWLINE flag to avoid

  unnecessary line trace for inlined expression.
  (ruby-bugs PR#1320)

* numeric.c (flo_to_s): tweak output string based to preserve
  decimal point and to remove trailing zeros.  [ruby-talk:97891]

* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
  search.  [ruby-talk:97342]

* hash.c (rb_hash_equal): returns true if two hashes have same set
  of key-value set.  [ruby-talk:97559]

* hash.c (rb_hash_eql): returns true if two hashes are equal and
  have same default values.

* string.c (rb_str_equal): always returns true or false, never
  returns nil. [ruby-dev:23404]


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

1 files changed, 2 insertions, 2 deletions

diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index 458dc89d4a..f1563b0dff 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -43,7 +43,7 @@ def charset_alias(config_charset, mapfile, target = OS)
   st = Hash.new(0)
   map = map.sort.collect do |can, *sys|
     if sys.grep(/^en_us(?=.|$)/i) {break true} == true
-      noen = %r"^(?!en_us)\w+_\w+#{Regexp.new($')}$"i
+      noen = %r"^(?!en_us)\w+_\w+#{Regexp.new($')}$"i #"
       sys.reject! {|s| noen =~ s}
     end
     sys = sys.first
@@ -67,7 +67,7 @@ def charset_alias(config_charset, mapfile, target = OS)
       else
         sys = "'#{sys}'.freeze"
       end
-      f.puts("  charset_map['#{can}'.freeze] = #{sys}")
+      f.puts("  charset_map['#{can}'] = #{sys}")
     end
     f.puts("end")
   end