summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-05-17 16:53:32 -0400
committerChet Ramey <chet.ramey@case.edu>2014-05-17 16:53:32 -0400
commitfb914b20839322c962918590b3ea449555d7d9f9 (patch)
tree5041a42bfc8958ab90f10dbf8996b886c000d135
parent835a39225c6bd4784c0d7f775b0cd44dd7c57f35 (diff)
downloadreadline-fb914b20839322c962918590b3ea449555d7d9f9.tar.gz
Readline-6.3 patch 6
-rw-r--r--display.c9
-rw-r--r--patchlevel2
2 files changed, 8 insertions, 3 deletions
diff --git a/display.c b/display.c
index dccfdc7..4df1f73 100644
--- a/display.c
+++ b/display.c
@@ -1637,7 +1637,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
/* 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,
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)
{
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
@@ -1825,8 +1825,13 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
else
_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)))
- goto clear_rest_of_line;
+ {
+ _rl_move_cursor_relative (ne-new, new);
+ goto clear_rest_of_line;
+ }
}
}
/* Otherwise, print over the existing material. */
diff --git a/patchlevel b/patchlevel
index e0ba09d..6ebd6a5 100644
--- a/patchlevel
+++ b/patchlevel
@@ -1,3 +1,3 @@
# Do not edit -- exists only for use by patch
-5
+6