|
 |
3fb13f |
From b0776d8c49ab4310fa056ce1033985996c5b9807 Mon Sep 17 00:00:00 2001
|
|
|
3fb13f |
From: Chet Ramey <chet.ramey@case.edu>
|
|
|
3fb13f |
Date: Tue, 6 Feb 2018 16:22:34 -0500
|
|
|
3fb13f |
Subject: [PATCH] Bash-4.4 patch 19
|
|
|
3fb13f |
|
|
|
3fb13f |
---
|
|
|
3fb13f |
lib/readline/display.c | 4 +++-
|
|
|
3fb13f |
patchlevel.h | 2 +-
|
|
|
3fb13f |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
3fb13f |
|
|
|
3fb13f |
diff --git a/lib/readline/display.c b/lib/readline/display.c
|
|
|
3fb13f |
index 41fb0531..2d2e768a 100644
|
|
|
3fb13f |
--- a/lib/readline/display.c
|
|
|
3fb13f |
+++ b/lib/readline/display.c
|
|
|
3fb13f |
@@ -771,7 +771,9 @@ rl_redisplay ()
|
|
|
3fb13f |
appear in the first and last lines of the prompt */
|
|
|
3fb13f |
wadjust = (newlines == 0)
|
|
|
3fb13f |
? prompt_invis_chars_first_line
|
|
|
3fb13f |
- : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line);
|
|
|
3fb13f |
+ : ((newlines == prompt_lines_estimate)
|
|
|
3fb13f |
+ ? (wrap_offset - prompt_invis_chars_first_line)
|
|
|
3fb13f |
+ : 0);
|
|
|
3fb13f |
|
|
|
3fb13f |
/* fix from Darin Johnson <darin@acuson.com> for prompt string with
|
|
|
3fb13f |
invisible characters that is longer than the screen width. The
|
|
|
3fb13f |
diff --git a/patchlevel.h b/patchlevel.h
|
|
|
3fb13f |
index f0ee56e4..a711c495 100644
|
|
|
3fb13f |
--- a/patchlevel.h
|
|
|
3fb13f |
+++ b/patchlevel.h
|
|
|
3fb13f |
@@ -25,6 +25,6 @@
|
|
|
3fb13f |
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
|
|
|
3fb13f |
looks for to find the patch level (for the sccs version string). */
|
|
|
3fb13f |
|
|
|
3fb13f |
-#define PATCHLEVEL 18
|
|
|
3fb13f |
+#define PATCHLEVEL 19
|
|
|
3fb13f |
|
|
|
3fb13f |
#endif /* _PATCHLEVEL_H_ */
|
|
|
3fb13f |
--
|
|
|
3fb13f |
2.13.6
|
|
|
3fb13f |
|