              lpos+=1
              if (lpos >= @_rl_screenwidth)
                @inv_lbreaks[newlines+=1] = out
-@@ -5409,7 +5405,7 @@ module RbReadline
-   # Make the history entry at WHICH have LINE and DATA.  This returns
-   #   the old entry so you can dispose of the data.  In the case of an
-   #   invalid WHICH, a NULL pointer is returned.
--  def replace_history_entry (which, line, data)
-+  def replace_history_entry(which, line, data)
-     if (which < 0 || which >= @history_length)
-       return nil
-     end
-@@ -5492,7 +5488,7 @@ module RbReadline
-     0
-   end
- 
--  def _rl_history_set_point ()
-+  def _rl_history_set_point()
-     @rl_point = (@_rl_history_preserve_point && @_rl_history_saved_point != -1) ?
-       @_rl_history_saved_point : @rl_end
-     if (@rl_point > @rl_end)
-@@ -5584,7 +5580,6 @@ module RbReadline
- 
-     if @rl_byte_oriented
-       incoming << c
--      incoming_length = 1
-     else
-       @pending_bytes << c
-       if _rl_get_char_len(@pending_bytes) == -2
-@@ -5592,7 +5587,6 @@ module RbReadline
-       else
-         incoming = @pending_bytes
-         @pending_bytes = ''
--        incoming_length = incoming.length
-       end
-     end
- 
-@@ -7134,9 +7128,9 @@ module RbReadline
- 
-   # Kill from here to the end of the line.  If DIRECTION is negative, kill
-   #   back to the line start instead.
--  def rl_kill_line (direction, ignore)
-+  def rl_kill_line(direction, ignore)
-     if (direction < 0)
--      return (rl_backward_kill_line(1, ignore))
-+      return rl_backward_kill_line(1, ignore)
-     else
-       orig_point = @rl_point
-       rl_end_of_line(1, ignore)
-@@ -7778,7 +7772,7 @@ module RbReadline
-     0
-   end
- 
--  def rl_backward_char_search (count, key)
-+  def rl_backward_char_search(count, key)
-     _rl_char_search(count, BFIND, FFIND)
-   end
- 
-@@ -8087,7 +8081,7 @@ module RbReadline
-   end
- 
-   # Do an anchored search for string through the history in DIRECTION.
--  def history_search_prefix (string, direction)
-+  def history_search_prefix(string, direction)
-     history_search_internal(string, direction, ANCHORED_SEARCH)
-   end
- 

 module RbReadline
   require 'etc'
 
@@ -3474,7 +3470,7 @@ module RbReadline
         if (!@rl_byte_oriented)
           _rl_wrapped_multicolumn = 0
           if (@_rl_screenwidth < lpos + wc_width)

               # The space will be removed in update_line()
               line[out,1] = ' '
               out += 1
@@ -3501,7 +3497,7 @@ module RbReadline
           end
           line[out,wc_bytes] = @rl_line_buffer[_in,wc_bytes]
           out += wc_bytes
