Merge pull request #2648 from pkerling/master
[feed/packages.git] / utils / bash / patches / 111-upstream-bash43-011.patch
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 4.3
5 Patch-ID: bash43-011
6
7 Bug-Reported-by: Egmont Koblinger <egmont@gmail.com>
8 Bug-Reference-ID: <CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg@mail.gmail.com>
9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html
10
11 Bug-Description:
12
13 The signal handling changes to bash and readline (to avoid running any code
14 in a signal handler context) cause the cursor to be placed on the wrong
15 line of a multi-line command after a ^C interrupts editing.
16
17 Patch (apply with `patch -p0'):
18
19 --- a/lib/readline/display.c
20 +++ b/lib/readline/display.c
21 @@ -2677,7 +2677,8 @@ _rl_clean_up_for_exit ()
22 {
23 if (_rl_echoing_p)
24 {
25 - _rl_move_vert (_rl_vis_botlin);
26 + if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
27 + _rl_move_vert (_rl_vis_botlin);
28 _rl_vis_botlin = 0;
29 fflush (rl_outstream);
30 rl_restart_output (1, 0);
31 --- a/patchlevel.h
32 +++ b/patchlevel.h
33 @@ -25,6 +25,6 @@
34 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
35 looks for to find the patch level (for the sccs version string). */
36
37 -#define PATCHLEVEL 10
38 +#define PATCHLEVEL 11
39
40 #endif /* _PATCHLEVEL_H_ */