* numeric.c (flo_divmod): protect float values from GC by

  assignment to local variables.  [ruby-dev:24873]

* string.c (str_mod_check): frozen check should be separated.
  [ruby-core:3742]

* array.c (rb_ary_update): pedantic check to detect
  rb_ary_to_ary() to modify the receiver.  [ruby-dev:24861]

* string.c (rb_str_justify): typo fixed.  [ruby-dev:24851]


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

1 files changed, 6 insertions, 3 deletions

diff --git a/hash.c b/hash.c
index fbf8d5d20d..b51cbdddce 100644
--- a/hash.c
+++ b/hash.c
@@ -1576,8 +1576,10 @@ rb_hash_update_block_i(key, value, hash)
 
 /*
  *  call-seq:
- *     hsh.merge!(other_hash)    => hsh
- *     hsh.update(other_hash)    => hsh
+ *     hsh.merge!(other_hash)                                 => hsh
+ *     hsh.update(other_hash)                                 => hsh
+ *     hsh.merge!(other_hash){|key, oldval, newval| block}    => hsh
+ *     hsh.update(other_hash){|key, oldval, newval| block}    => hsh
  *  
  *  Adds the contents of <i>other_hash</i> to <i>hsh</i>, overwriting
  *  entries with duplicate keys with those from <i>other_hash</i>.
@@ -1603,7 +1605,8 @@ rb_hash_update(hash1, hash2)
 
 /*
  *  call-seq:
- *     hsh.merge(other_hash) -> a_hash
+ *     hsh.merge(other_hash)                              -> a_hash
+ *     hsh.merge(other_hash){|key, oldval, newval| block} -> a_hash
  *  
  *  Returns a new hash containing the contents of <i>other_hash</i> and
  *  the contents of <i>hsh</i>, overwriting entries in <i>hsh</i> with