lib/reline/config.rb in reline-0.5.4 vs lib/reline/config.rb in reline-0.5.5

@@ -67,21 +67,18 @@
     @history_size = -1 # unlimited
     @keyseq_timeout = 500
     @test_mode = false
     @autocompletion = false
     @convert_meta = true if seven_bit_encoding?(Reline::IOGate.encoding)
+    @loaded = false
   end
 
   def reset
     if editing_mode_is?(:vi_command)
       @editing_mode_label = :vi_insert
     end
-    @additional_key_bindings.keys.each do |key|
-      @additional_key_bindings[key].clear
-    end
     @oneshot_key_bindings.clear
-    reset_default_key_bindings
   end
 
   def editing_mode
     @key_actors[@editing_mode_label]
   end
@@ -96,10 +93,14 @@
 
   def keymap
     @key_actors[@keymap_label]
   end
 
+  def loaded?
+    @loaded
+  end
+
   def inputrc_path
     case ENV['INPUTRC']
     when nil, ''
     else
       return File.expand_path(ENV['INPUTRC'])
@@ -127,10 +128,11 @@
   private def default_inputrc_path
     @default_inputrc_path ||= inputrc_path
   end
 
   def read(file = nil)
+    @loaded = true
     file ||= default_inputrc_path
     begin
       if file.respond_to?(:readlines)
         lines = file.readlines
       else
@@ -167,15 +169,9 @@
     @key_actors[keymap].default_key_bindings[keystroke] = target
   end
 
   def add_default_key_binding(keystroke, target)
     @key_actors[@keymap_label].default_key_bindings[keystroke] = target
-  end
-
-  def reset_default_key_bindings
-    @key_actors.values.each do |ka|
-      ka.reset_default_key_bindings
-    end
   end
 
   def read_lines(lines, file = nil)
     if not lines.empty? and lines.first.encoding != Reline.encoding_system_needs
       begin