From 0516a3378f03e8563350b8c4fe94ac3f9e9c9f75 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 20 Dec 2015 06:36:57 +0000
Subject: * lib/erb.rb: revert r53123. It break compatibility like thor and
 rspec-rails.   We should try with Ruby 2.4 or 3.0.   [Bug
 #11842][ruby-core:72374] * lib/rdoc/erb_partial.rb: ditto. *
 template/verconf.h.tmpl: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 template/verconf.h.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/verconf.h.tmpl')

diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
index 9e09b776ea..9325aee0ff 100644
--- a/template/verconf.h.tmpl
+++ b/template/verconf.h.tmpl
@@ -52,7 +52,7 @@
 % R["exec_prefix"] = '"RUBY_EXEC_PREFIX"'
 % R["prefix"] = '"RUBY_EXEC_PREFIX"'
 % exec_prefix_pat = /\A"#{Regexp.quote(rbconfig::CONFIG['exec_prefix'])}(?=\/|\z)/
-% _erbout = [_erbout.join.gsub!(/^(#define\s+(\S+)\s+)(.*)/) {
+% _erbout.gsub!(/^(#define\s+(\S+)\s+)(.*)/) {
 %   pre, name, repl = $1, $2, $3
 %   pat = %["#{name}"]
 %   c = C.merge(R.reject {|key, value| key == name or value.include?(pat)})
@@ -60,4 +60,4 @@
 %   repl.gsub!(/^""(?!$)|(.)""$/, '\1')
 %   repl.sub!(exec_prefix_pat, 'RUBY_EXEC_PREFIX"')
 %   pre + repl
-% }]
+% }
-- 
cgit v1.2.3