aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/erb.rb7
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e7e03c43e..56a2976a2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov 6 01:52:31 2016 Akira Matsuda <ronnie@dio.jp>
+
+ * lib/erb.rb: Alias regist_scanner to register_scanner
+
Sun Nov 6 01:39:36 2016 Shugo Maeda <shugo@ruby-lang.org>
* compile.c (tailcallable_p): disable tail call optimization for
diff --git a/lib/erb.rb b/lib/erb.rb
index 7f9ec11b85..9483711024 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -355,8 +355,11 @@ class ERB
class Scanner # :nodoc:
@scanner_map = {}
- def self.regist_scanner(klass, trim_mode, percent)
- @scanner_map[[trim_mode, percent]] = klass
+ class << self
+ def register_scanner(klass, trim_mode, percent)
+ @scanner_map[[trim_mode, percent]] = klass
+ end
+ alias :regist_scanner :register_scanner
end
def self.default_scanner=(klass)