Permalink
Browse files

merge revision(s) 20587:

?\012
	* mkconfig.rb: fix for continued lines.  based on a patch from
	  Marcus Rueckert <darix AT opensu.se> 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 <shyouhei@ruby-lang.org>

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@34002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent f802fcb commit 3dbcd24b885a7596c39690d3fece32583cca917d @shyouhei shyouhei committed Dec 10, 2011
Showing with 10 additions and 6 deletions.
  1. +5 −0 ChangeLog
  2. +5 −6 mkconfig.rb
View
@@ -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
View
@@ -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"

0 comments on commit 3dbcd24

Please sign in to comment.