diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2014-05-16 14:17:38 -0400 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2014-05-16 14:17:38 -0400 |
| commit | eec5e6ee83ff3670706a6b5f097ce83202b31c9e (patch) | |
| tree | 19a03abac1618e446a6265bffae93c6c670065ec | |
| parent | 4a741ca48131f9403afb163f5abf8af58aac4482 (diff) | |
| download | android_external_bash-eec5e6ee83ff3670706a6b5f097ce83202b31c9e.tar.gz android_external_bash-eec5e6ee83ff3670706a6b5f097ce83202b31c9e.tar.bz2 android_external_bash-eec5e6ee83ff3670706a6b5f097ce83202b31c9e.zip | |
Bash-4.3 patch 13
| -rw-r--r-- | lib/readline/display.c | 9 | ||||
| -rw-r--r-- | patchlevel.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/readline/display.c b/lib/readline/display.c index dccfdc7..4df1f73 100644 --- a/lib/readline/display.c +++ b/lib/readline/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.h b/patchlevel.h index b5516c2..72064c5 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 12 +#define PATCHLEVEL 13 #endif /* _PATCHLEVEL_H_ */ |