b28b53c7ab6146a5923999cfbab31f6a96c836ec
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / readline / 0006-patchlevel-6.patch
1 From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-006
2
3 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
4
5                            READLINE PATCH REPORT
6                            =====================
7
8 Readline-Release: 6.3
9 Patch-ID: readline63-006
10
11 Bug-Reported-by:        <Trond.Endrestol@ximalas.info>
12 Bug-Reference-ID:       <alpine.BSF.2.03.1404192114310.1973@enterprise.ximalas.info>
13 Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html
14
15 Bug-Description:
16
17 Using reverse-i-search when horizontal scrolling is enabled does not redisplay
18 the entire line containing the successful search results.
19
20 Patch (apply with `patch -p0'):
21
22 *** a/readline-6.3-patched/display.c    2014-04-08 18:19:36.000000000 -0400
23 --- b/display.c 2014-04-20 18:32:52.000000000 -0400
24 ***************
25 *** 1638,1642 ****
26        the spot of first difference is before the end of the invisible chars,
27        lendiff needs to be adjusted. */
28 !   if (current_line == 0 && !_rl_horizontal_scroll_mode &&
29         current_invis_chars != visible_wrap_offset)
30       {
31 --- 1638,1642 ----
32        the spot of first difference is before the end of the invisible chars,
33        lendiff needs to be adjusted. */
34 !   if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
35         current_invis_chars != visible_wrap_offset)
36       {
37 ***************
38 *** 1826,1831 ****
39                 _rl_last_c_pos += bytes_to_insert;
40   
41               if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
42 !               goto clear_rest_of_line;
43             }
44         }
45 --- 1826,1836 ----
46                 _rl_last_c_pos += bytes_to_insert;
47   
48 +             /* XXX - we only want to do this if we are at the end of the line
49 +                so we move there with _rl_move_cursor_relative */
50               if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
51 !               {
52 !                 _rl_move_cursor_relative (ne-new, new);
53 !                 goto clear_rest_of_line;
54 !               }
55             }
56         }
57 *** a/readline-6.3/patchlevel   2013-11-15 08:11:11.000000000 -0500
58 --- b/patchlevel        2014-03-21 08:28:40.000000000 -0400
59 ***************
60 *** 1,3 ****
61   # Do not edit -- exists only for use by patch
62   
63 ! 5
64 --- 1,3 ----
65   # Do not edit -- exists only for use by patch
66   
67 ! 6