reline 0.1.7 → 0.2.1

data/lib/reline/line_editor.rb.rej

@@ -1,81 +0,0 @@
---- lib/reline/line_editor.rb
-+++ lib/reline/line_editor.rb
-@@ -1092,60 +1053,38 @@ class Reline::LineEditor
- 
-   private def ed_unassigned(key) end # do nothing
- 
--  private def process_insert(force: false)
--    return if @continuous_insertion_buffer.empty? or (Reline::IOGate.in_pasting? and not force)
--    #$stderr.puts 'process!!!!!!!'
--    width = Reline::Unicode.calculate_width(@continuous_insertion_buffer)
--    bytesize = @continuous_insertion_buffer.bytesize
--    if @cursor == @cursor_max
--      @line += @continuous_insertion_buffer
--    else
--      @line = byteinsert(@line, @byte_pointer, @continuous_insertion_buffer)
--    end
--    #$stderr.puts "#### #{@continuous_insertion_buffer.inspect}     =>    #{@line.inspect}"
--    #$stderr.puts "width #{width.inspect} bytesize #{bytesize.inspect}"
--    @byte_pointer += bytesize
--    @cursor += width
--    @cursor_max += width
--    @continuous_insertion_buffer.clear
--    @rerender_all = true
--  end
--
-   private def ed_insert(key)
--    str = nil
--    width = nil
--    bytesize = nil
-     if key.instance_of?(String)
-       begin
-         key.encode(Encoding::UTF_8)
-       rescue Encoding::UndefinedConversionError
-         return
-       end
--      str = key
--      bytesize = key.bytesize
-+      width = Reline::Unicode.get_mbchar_width(key)
-+      if @cursor == @cursor_max
-+        @line += key
-+      else
-+        @line = byteinsert(@line, @byte_pointer, key)
-+      end
-+      @byte_pointer += key.bytesize
-+      @cursor += width
-+      @cursor_max += width
-     else
-       begin
-         key.chr.encode(Encoding::UTF_8)
-       rescue Encoding::UndefinedConversionError
-         return
-       end
--      str = key.chr
--      bytesize = 1
-+      if @cursor == @cursor_max
-+        @line += key.chr
-+      else
-+        @line = byteinsert(@line, @byte_pointer, key.chr)
-+      end
-+      width = Reline::Unicode.get_mbchar_width(key.chr)
-+      @byte_pointer += 1
-+      @cursor += width
-+      @cursor_max += width
-     end
--    if Reline::IOGate.in_pasting?
--      #$stderr.puts 'pasting!!!!!!'
--      @continuous_insertion_buffer << str
--      return
--    end
--    width = Reline::Unicode.get_mbchar_width(str)
--    if @cursor == @cursor_max
--      @line += str
--    else
--      @line = byteinsert(@line, @byte_pointer, str)
--    end
--    @byte_pointer += bytesize
--    @cursor += width
--    @cursor_max += width
-   end
-   alias_method :ed_digit, :ed_insert
-   alias_method :self_insert, :ed_insert