LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.3 patch 13

Browse Source
This commit is contained in:
Chet Ramey
2014-05-16 14:17:38 -04:00
parent 4a741ca481
commit eec5e6ee83
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/readline/display.c
View File

@@ -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 /* 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)
@@ -1825,10 +1825,15 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
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)))
{
_rl_move_cursor_relative (ne-new, new);
goto clear_rest_of_line; goto clear_rest_of_line;
} }
} }
}
/* Otherwise, print over the existing material. */ /* Otherwise, print over the existing material. */
else else
{ {

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 12 #define PATCHLEVEL 13
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */