aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Fuller <abf@google.com>2015-05-03 18:18:25 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2015-05-03 18:18:25 +0200
commit4d8ddb810d52f5ad1bcef8bda07687200117e56b (patch)
treeac46c259745503425eb53208d993beb7e5e6e117
parentbbd53216f80912944da0d4ca72bf3ed3188ca156 (diff)
downloadbusybox-w32-4d8ddb810d52f5ad1bcef8bda07687200117e56b.tar.gz
busybox-w32-4d8ddb810d52f5ad1bcef8bda07687200117e56b.tar.bz2
busybox-w32-4d8ddb810d52f5ad1bcef8bda07687200117e56b.zip
vi: basic undo feature shouldn't depend on yankmark
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@google.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/vi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/editors/vi.c b/editors/vi.c
index 495332a46..2e4f7fcb5 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3676,11 +3676,6 @@ static void do_cmd(int c)
3676 string_insert(dot, p, ALLOW_UNDO); // insert the string 3676 string_insert(dot, p, ALLOW_UNDO); // insert the string
3677 end_cmd_q(); // stop adding to q 3677 end_cmd_q(); // stop adding to q
3678 break; 3678 break;
3679#if ENABLE_FEATURE_VI_UNDO
3680 case 'u': // u- undo last operation
3681 undo_pop();
3682 break;
3683#endif
3684 case 'U': // U- Undo; replace current line with original version 3679 case 'U': // U- Undo; replace current line with original version
3685 if (reg[Ureg] != NULL) { 3680 if (reg[Ureg] != NULL) {
3686 p = begin_line(dot); 3681 p = begin_line(dot);
@@ -3692,6 +3687,11 @@ static void do_cmd(int c)
3692 } 3687 }
3693 break; 3688 break;
3694#endif /* FEATURE_VI_YANKMARK */ 3689#endif /* FEATURE_VI_YANKMARK */
3690#if ENABLE_FEATURE_VI_UNDO
3691 case 'u': // u- undo last operation
3692 undo_pop();
3693 break;
3694#endif
3695 case '$': // $- goto end of line 3695 case '$': // $- goto end of line
3696 case KEYCODE_END: // Cursor Key End 3696 case KEYCODE_END: // Cursor Key End
3697 for (;;) { 3697 for (;;) {