From: Andrew Fuller <abf@google.com>
Date: Sun, 3 May 2015 16:18:25 +0000 (+0200)
Subject: vi: basic undo feature shouldn't depend on yankmark
X-Git-Tag: 1_24_0~137
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4d8ddb810d52f5ad1bcef8bda07687200117e56b;p=oweals%2Fbusybox.git

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>
---

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)
 		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 (;;) {