debian/patches/bash42-002.diff

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