yugui	2010-05-23 21:18:37 +0900 (Sun, 23 May 2010)

  New Revision: 27974

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27974

  Log:
    merges r27929 from trunk into ruby_1_9_2.
    --
    * re.c (rb_reg_s_union_m): update rdoc.  [ruby-dev:41354]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/re.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27973)
+++ ruby_1_9_2/ChangeLog	(revision 27974)
@@ -1,3 +1,7 @@
+Thu May 20 22:49:04 2010  Yusuke Endoh  <mame@t...>
+
+	* re.c (rb_reg_s_union_m): update rdoc.  [ruby-dev:41354]
+
 Thu May 20 20:47:46 2010  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (ole_invoke): raise NoMethodError
Index: ruby_1_9_2/re.c
===================================================================
--- ruby_1_9_2/re.c	(revision 27973)
+++ ruby_1_9_2/re.c	(revision 27974)
@@ -3195,6 +3195,7 @@
  *  <em>pattern</em>s, i.e., will match any of its parts. The <em>pattern</em>s
  *  can be Regexp objects, in which case their options will be preserved, or
  *  Strings. If no patterns are given, returns <code>/(?!)/</code>.
+ *  The behavior is unspecified if any given <em>pattern</em> contains capture.
  *
  *     Regexp.union                         #=> /(?!)/
  *     Regexp.union("penzance")             #=> /penzance/

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/