components/bash/patches/bash43-013.patch
changeset 5518 c47fe0edc204
equal deleted inserted replaced
5517:7758049098f4 5518:c47fe0edc204
       
     1 			     BASH PATCH REPORT
       
     2 			     =================
       
     3 
       
     4 Bash-Release:	4.3
       
     5 Patch-ID:	bash43-013
       
     6 
       
     7 Bug-Reported-by:	<[email protected]>
       
     8 Bug-Reference-ID:	<[email protected]>
       
     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 *** ../bash-4.3-patched/lib/readline/display.c	2014-04-08 18:19:36.000000000 -0400
       
    18 --- lib/readline/display.c	2014-04-20 18:32:52.000000000 -0400
       
    19 ***************
       
    20 *** 1638,1642 ****
       
    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         current_invis_chars != visible_wrap_offset)
       
    25       {
       
    26 --- 1638,1642 ----
       
    27        the spot of first difference is before the end of the invisible chars,
       
    28        lendiff needs to be adjusted. */
       
    29 !   if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
       
    30         current_invis_chars != visible_wrap_offset)
       
    31       {
       
    32 ***************
       
    33 *** 1826,1831 ****
       
    34   		_rl_last_c_pos += bytes_to_insert;
       
    35   
       
    36   	      if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
       
    37 ! 		goto clear_rest_of_line;
       
    38   	    }
       
    39   	}
       
    40 --- 1826,1836 ----
       
    41   		_rl_last_c_pos += bytes_to_insert;
       
    42   
       
    43 + 	      /* XXX - we only want to do this if we are at the end of the line
       
    44 + 		 so we move there with _rl_move_cursor_relative */
       
    45   	      if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
       
    46 ! 		{
       
    47 ! 		  _rl_move_cursor_relative (ne-new, new);
       
    48 ! 		  goto clear_rest_of_line;
       
    49 ! 		}
       
    50   	    }
       
    51   	}
       
    52 *** ../bash-4.3/patchlevel.h	2012-12-29 10:47:57.000000000 -0500
       
    53 --- patchlevel.h	2014-03-20 20:01:28.000000000 -0400
       
    54 ***************
       
    55 *** 26,30 ****
       
    56      looks for to find the patch level (for the sccs version string). */
       
    57   
       
    58 ! #define PATCHLEVEL 12
       
    59   
       
    60   #endif /* _PATCHLEVEL_H_ */
       
    61 --- 26,30 ----
       
    62      looks for to find the patch level (for the sccs version string). */
       
    63   
       
    64 ! #define PATCHLEVEL 13
       
    65   
       
    66   #endif /* _PATCHLEVEL_H_ */