Merge pull request #4835 from dibdot/adblock
[feed/packages.git] / utils / bash / patches / 104-upstream-bash43-004.patch
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 4.3
5 Patch-ID: bash43-004
6
7 Bug-Reported-by: Daan van Rossum <daan@flash.uchicago.edu>
8 Bug-Reference-ID: <20140307072523.GA14250@flash.uchicago.edu>
9 Bug-Reference-URL:
10
11 Bug-Description:
12
13 The `.' command in vi mode cannot undo multi-key commands beginning with
14 `c', `d', and `y' (command plus motion specifier).
15
16 Patch (apply with `patch -p0'):
17
18 --- a/lib/readline/readline.c
19 +++ b/lib/readline/readline.c
20 @@ -965,7 +965,7 @@ _rl_dispatch_subseq (key, map, got_subse
21 #if defined (VI_MODE)
22 if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
23 key != ANYOTHERKEY &&
24 - rl_key_sequence_length == 1 && /* XXX */
25 + _rl_dispatching_keymap == vi_movement_keymap &&
26 _rl_vi_textmod_command (key))
27 _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
28 #endif
29 --- a/patchlevel.h
30 +++ b/patchlevel.h
31 @@ -25,6 +25,6 @@
32 regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
33 looks for to find the patch level (for the sccs version string). */
34
35 -#define PATCHLEVEL 3
36 +#define PATCHLEVEL 4
37
38 #endif /* _PATCHLEVEL_H_ */