diff options
author | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-05-18 09:36:27 +0100 |
commit | 60063627a6d540871061854a362047e6517f821c (patch) | |
tree | 0de228630450c64e085f2e3f5141b5ba17eccab3 /editors/vi.c | |
parent | ec39cb770ddd5c0e085d5c4ee10be65bab5e7a44 (diff) | |
parent | 9a595bb36ded308e6d4336aef2c1cd3ac738a398 (diff) | |
download | busybox-w32-60063627a6d540871061854a362047e6517f821c.tar.gz busybox-w32-60063627a6d540871061854a362047e6517f821c.tar.bz2 busybox-w32-60063627a6d540871061854a362047e6517f821c.zip |
Merge branch 'busybox' into mergeFRP
Diffstat (limited to 'editors/vi.c')
-rw-r--r-- | editors/vi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/vi.c b/editors/vi.c index 926aef19b..3eed279e7 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -3723,11 +3723,6 @@ static void do_cmd(int c) | |||
3723 | string_insert(dot, p, ALLOW_UNDO); // insert the string | 3723 | string_insert(dot, p, ALLOW_UNDO); // insert the string |
3724 | end_cmd_q(); // stop adding to q | 3724 | end_cmd_q(); // stop adding to q |
3725 | break; | 3725 | break; |
3726 | #if ENABLE_FEATURE_VI_UNDO | ||
3727 | case 'u': // u- undo last operation | ||
3728 | undo_pop(); | ||
3729 | break; | ||
3730 | #endif | ||
3731 | case 'U': // U- Undo; replace current line with original version | 3726 | case 'U': // U- Undo; replace current line with original version |
3732 | if (reg[Ureg] != NULL) { | 3727 | if (reg[Ureg] != NULL) { |
3733 | p = begin_line(dot); | 3728 | p = begin_line(dot); |
@@ -3739,6 +3734,11 @@ static void do_cmd(int c) | |||
3739 | } | 3734 | } |
3740 | break; | 3735 | break; |
3741 | #endif /* FEATURE_VI_YANKMARK */ | 3736 | #endif /* FEATURE_VI_YANKMARK */ |
3737 | #if ENABLE_FEATURE_VI_UNDO | ||
3738 | case 'u': // u- undo last operation | ||
3739 | undo_pop(); | ||
3740 | break; | ||
3741 | #endif | ||
3742 | case '$': // $- goto end of line | 3742 | case '$': // $- goto end of line |
3743 | case KEYCODE_END: // Cursor Key End | 3743 | case KEYCODE_END: // Cursor Key End |
3744 | for (;;) { | 3744 | for (;;) { |