merge revision(s) 20587:

shyouhei · shyouhei · commit ff8f8c190b5e · 2011-12-10T12:17:30.000Z
* mkconfig.rb: fix for continued lines.  based on a patch from
	  Marcus Rueckert &lt;darix AT opensu.se&gt; at [ruby-core:20420].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei &lt;shyouhei@ruby-lang.org&gt;

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 17 04:20:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: fix for continued lines.  based on a patch from
+	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
+
 Mon Oct 17 04:19:39 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (flo_cmp): Infinity is greater than any bignum
diff --git a/mkconfig.rb b/mkconfig.rb
@@ -56,14 +56,13 @@ module Config
       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"

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Mon Oct 17 04:20:22 2011  Nobuyoshi Nakada  <[email protected]>
++
 +	* mkconfig.rb: fix for continued lines.  based on a patch from
 +	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
++
 Mon Oct 17 04:19:39 2011  Yukihiro Matsumoto  <[email protected]>
 	* numeric.c (flo_cmp): Infinity is greater than any bignum