Branch oldpackages for 14.07
[14.07/packages.git] / utils / bash / patches / 102-upstream-bash42-002.patch
1                              BASH PATCH REPORT
2                              =================
3
4 Bash-Release:   4.2
5 Patch-ID:       bash42-002
6
7 Bug-Reported-by:        Clark J. Wang <dearvoid@gmail.com>
8 Bug-Reference-ID:       <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
9 Bug-Reference-URL:      http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
10
11 Bug-Description:
12
13 The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
14 entire line.
15
16 Patch (apply with `patch -p0'):
17
18 --- a/lib/readline/vi_mode.c
19 +++ b/lib/readline/vi_mode.c
20 @@ -1114,7 +1114,7 @@ rl_domove_read_callback (m)
21        rl_beg_of_line (1, c);
22        _rl_vi_last_motion = c;
23        RL_UNSETSTATE (RL_STATE_VIMOTION);
24 -      return (0);
25 +      return (vidomove_dispatch (m));
26      }
27  #if defined (READLINE_CALLBACKS)
28    /* XXX - these need to handle rl_universal_argument bindings */
29 --- a/lib/readline/callback.c
30 +++ b/lib/readline/callback.c
31 @@ -148,6 +148,9 @@ rl_callback_read_char ()
32           eof = _rl_vi_domove_callback (_rl_vimvcxt);
33           /* Should handle everything, including cleanup, numeric arguments,
34              and turning off RL_STATE_VIMOTION */
35 +         if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
36 +           _rl_internal_char_cleanup ();
37 +
38           return;
39         }
40  #endif
41 --- a/patchlevel.h
42 +++ b/patchlevel.h
43 @@ -25,6 +25,6 @@
44     regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
45     looks for to find the patch level (for the sccs version string). */
46  
47 -#define PATCHLEVEL 1
48 +#define PATCHLEVEL 2
49  
50  #endif /* _PATCHLEVEL_H_ */