yugui	2008-12-12 23:54:37 +0900 (Fri, 12 Dec 2008)

  New Revision: 20677

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

  Log:
    merges r20587 from trunk into ruby_1_9_1.
    * mkconfig.rb: fix for continued lines.  based on a patch from
      Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/mkconfig.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20676)
+++ ruby_1_9_1/ChangeLog	(revision 20677)
@@ -1,3 +1,8 @@
+Tue Dec  9 03:21:37 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* mkconfig.rb: fix for continued lines.  based on a patch from
+	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
+
 Fri Dec  5 22:56:24 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* eval.c (rb_make_exception): single argument to raise may be
Index: ruby_1_9_1/mkconfig.rb
===================================================================
--- ruby_1_9_1/mkconfig.rb	(revision 20676)
+++ ruby_1_9_1/mkconfig.rb	(revision 20677)
@@ -56,14 +56,13 @@
       continued_name = name
       next
     end
-  when /^"(.+)"\s*(\\)?$/
+  when /^"(.*)"\s*(\\)?$/
     if continued_line
       continued_line <<  $1
-      unless $2
-	val = continued_line.join("")
-	name = continued_name
-	continued_line = nil
-      end
+      next if $2
+      val = continued_line.join("")
+      name = continued_name
+      continued_line = nil
     end
   when /^(?:ac_given_)?INSTALL=(.*)/
     v_fast << "  CONFIG[\"INSTALL\"] = " + $1 + "\n"

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