[PATCH] vi: basic undo feature shouldn't depend on yankmark

[Denys Vlasenko]

Applied, thanks!

On Sat, May 2, 2015 at 9:36 PM, Andrew Fuller <abf at google.com> wrote:
> Currently basic undo functionality with the 'u' key depends on
> FEATURE_VI_YANKMARK. These two features are separate, so we can remove this
> dependency.
>
> Signed-off-by: Andrew Fuller <abf at google.com>
> ---
>  editors/vi.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> diff --git a/editors/vi.c b/editors/vi.c
> index 495332a..564f713 100644
> --- a/editors/vi.c
> +++ b/editors/vi.c
> @@ -3676,11 +3676,6 @@ static void do_cmd(int c)
>                 string_insert(dot, p, ALLOW_UNDO);      // insert the string
>                 end_cmd_q();    // stop adding to q
>                 break;
> -#if ENABLE_FEATURE_VI_UNDO
> -       case 'u':       // u- undo last operation
> -               undo_pop();
> -               break;
> -#endif
>         case 'U':                       // U- Undo; replace current line
> with original version
>                 if (reg[Ureg] != NULL) {
>                         p = begin_line(dot);
> @@ -3692,6 +3687,11 @@ static void do_cmd(int c)
>                 }
>                 break;
>  #endif /* FEATURE_VI_YANKMARK */
> +#if ENABLE_FEATURE_VI_UNDO
> +       case 'u':       // u- undo last operation
> +               undo_pop();
> +               break;
> +#endif
>         case '$':                       // $- goto end of line
>         case KEYCODE_END:               // Cursor Key End
>                 for (;;) {
> --
> 2.2.0.rc0.207.ga3a616c
>
> _______________________________________________
> busybox mailing list
> busybox at busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox