version 1.1.1.1, 2014/07/30 08:16:45
|
version 1.1.1.1.2.1, 2014/07/30 08:19:29
|
Line 1637 update_line (old, new, current_line, omax, nmax, inv_b
|
Line 1637 update_line (old, new, current_line, omax, nmax, inv_b
|
/* If we are changing the number of invisible characters in a line, and |
/* If we are changing the number of invisible characters in a line, and |
the spot of first difference is before the end of the invisible chars, |
the spot of first difference is before the end of the invisible chars, |
lendiff needs to be adjusted. */ |
lendiff needs to be adjusted. */ |
if (current_line == 0 && !_rl_horizontal_scroll_mode && | if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */ |
current_invis_chars != visible_wrap_offset) |
current_invis_chars != visible_wrap_offset) |
{ |
{ |
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) |
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) |
Line 1825 update_line (old, new, current_line, omax, nmax, inv_b
|
Line 1825 update_line (old, new, current_line, omax, nmax, inv_b
|
else |
else |
_rl_last_c_pos += bytes_to_insert; |
_rl_last_c_pos += bytes_to_insert; |
|
|
|
/* XXX - we only want to do this if we are at the end of the line |
|
so we move there with _rl_move_cursor_relative */ |
if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) |
if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) |
goto clear_rest_of_line; | { |
| _rl_move_cursor_relative (ne-new, new); |
| goto clear_rest_of_line; |
| } |
} |
} |
} |
} |
/* Otherwise, print over the existing material. */ |
/* Otherwise, print over the existing material. */ |
Line 2677 _rl_clean_up_for_exit ()
|
Line 2682 _rl_clean_up_for_exit ()
|
{ |
{ |
if (_rl_echoing_p) |
if (_rl_echoing_p) |
{ |
{ |
_rl_move_vert (_rl_vis_botlin); | if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */ |
| _rl_move_vert (_rl_vis_botlin); |
_rl_vis_botlin = 0; |
_rl_vis_botlin = 0; |
fflush (rl_outstream); |
fflush (rl_outstream); |
rl_restart_output (1, 0); |
rl_restart_output (1, 0); |