From: Chet Ramey Date: Tue, 6 Feb 2018 21:22:34 +0000 (-0500) Subject: Bash-4.4 patch 19 X-Git-Tag: bash-5.0-alpha~2 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fbash.git;a=commitdiff_plain;h=b0776d8c49ab4310fa056ce1033985996c5b9807 Bash-4.4 patch 19 --- diff --git a/lib/readline/display.c b/lib/readline/display.c index 41fb05312..2d2e768a9 100644 --- a/lib/readline/display.c +++ b/lib/readline/display.c @@ -771,7 +771,9 @@ rl_redisplay () appear in the first and last lines of the prompt */ wadjust = (newlines == 0) ? prompt_invis_chars_first_line - : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line); + : ((newlines == prompt_lines_estimate) + ? (wrap_offset - prompt_invis_chars_first_line) + : 0); /* fix from Darin Johnson for prompt string with invisible characters that is longer than the screen width. The diff --git a/patchlevel.h b/patchlevel.h index f0ee56e4c..a711c4957 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 18 +#define PATCHLEVEL 19 #endif /* _PATCHLEVEL_H_ */