113-upstream-bash43-013.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. BASH PATCH REPORT
  2. =================
  3. Bash-Release: 4.3
  4. Patch-ID: bash43-013
  5. Bug-Reported-by: <Trond.Endrestol@ximalas.info>
  6. Bug-Reference-ID: <alpine.BSF.2.03.1404192114310.1973@enterprise.ximalas.info>
  7. Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html
  8. Bug-Description:
  9. Using reverse-i-search when horizontal scrolling is enabled does not redisplay
  10. the entire line containing the successful search results.
  11. Patch (apply with `patch -p0'):
  12. --- a/lib/readline/display.c
  13. +++ b/lib/readline/display.c
  14. @@ -1637,7 +1637,7 @@ update_line (old, new, current_line, oma
  15. /* If we are changing the number of invisible characters in a line, and
  16. the spot of first difference is before the end of the invisible chars,
  17. lendiff needs to be adjusted. */
  18. - if (current_line == 0 && !_rl_horizontal_scroll_mode &&
  19. + if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
  20. current_invis_chars != visible_wrap_offset)
  21. {
  22. if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
  23. @@ -1825,8 +1825,13 @@ update_line (old, new, current_line, oma
  24. else
  25. _rl_last_c_pos += bytes_to_insert;
  26. + /* XXX - we only want to do this if we are at the end of the line
  27. + so we move there with _rl_move_cursor_relative */
  28. if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
  29. - goto clear_rest_of_line;
  30. + {
  31. + _rl_move_cursor_relative (ne-new, new);
  32. + goto clear_rest_of_line;
  33. + }
  34. }
  35. }
  36. /* Otherwise, print over the existing material. */
  37. --- a/patchlevel.h
  38. +++ b/patchlevel.h
  39. @@ -25,6 +25,6 @@
  40. regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
  41. looks for to find the patch level (for the sccs version string). */
  42. -#define PATCHLEVEL 12
  43. +#define PATCHLEVEL 13
  44. #endif /* _PATCHLEVEL_H_ */