1
0

111-upstream-bash43-011.patch 1.2 KB

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