diff --git a/lib/irb/color.rb b/lib/irb/color.rb index 94c4de831..c4513f5b0 100644 --- a/lib/irb/color.rb +++ b/lib/irb/color.rb @@ -77,7 +77,6 @@ module Color class << self def colorable? - # NOT using context.use_colorize? of IRB.conf[:MAIN_CONTEXT] because this method may be called before IRB::Irb#run $stdout.tty? && (/mswin|mingw/ =~ RUBY_PLATFORM || (ENV.key?('TERM') && ENV['TERM'] != 'dumb')) && IRB.conf.fetch(:USE_COLORIZE, true) end diff --git a/lib/irb/context.rb b/lib/irb/context.rb index 0a46c1b1d..e6c993d42 100644 --- a/lib/irb/context.rb +++ b/lib/irb/context.rb @@ -53,7 +53,6 @@ def initialize(irb, workspace = nil, input_method = nil) else @use_multiline = nil end - @use_colorize = IRB.conf[:USE_COLORIZE] @use_autocomplete = IRB.conf[:USE_AUTOCOMPLETE] @verbose = IRB.conf[:VERBOSE] @io = nil @@ -186,8 +185,6 @@ def main attr_reader :use_singleline # Whether colorization is enabled or not. # - # A copy of the default IRB.conf[:USE_COLORIZE] - attr_reader :use_colorize # A copy of the default IRB.conf[:USE_AUTOCOMPLETE] attr_reader :use_autocomplete # A copy of the default IRB.conf[:INSPECT_MODE] @@ -332,8 +329,6 @@ def main alias use_readline use_singleline # backward compatibility alias use_readline? use_singleline - # Alias for #use_colorize - alias use_colorize? use_colorize # Alias for #use_autocomplete alias use_autocomplete? use_autocomplete # Alias for #rc diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb index b7e2370fd..64296d735 100644 --- a/test/irb/test_context.rb +++ b/test/irb/test_context.rb @@ -179,7 +179,6 @@ def test_output_to_pipe end def test_default_config - assert_equal(true, @context.use_colorize?) assert_equal(true, @context.use_autocomplete?) end