utils/bash/patches/113-upstream-bash43-013.patch

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