summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston2021-04-25 11:53:23 +0100
committerDenys Vlasenko2021-04-28 11:29:33 +0200
commitb9aaa375a3acd83eeca8721d925bca67398bd3af (patch)
treea147d6e3ec9b57a6a278d2712d54ed82da9c2451
parent09172582daa98f575a711de2f0e3cf3bf88b8346 (diff)
downloadbusybox-b9aaa375a3acd83eeca8721d925bca67398bd3af.zip
busybox-b9aaa375a3acd83eeca8721d925bca67398bd3af.tar.gz
vi: 'ZZ' should warn if there are more files to edit
When 'ZZ' was used to save the current file and more files were available to edit BusyBox vi immediately moved on to the next file. The correct behaviour is to issue a warning. function old new delta do_cmd 4673 4724 +51 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 1/0 up/down: 51/0) Total: 51 bytes Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/vi.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/editors/vi.c b/editors/vi.c
index a38f218..7de55d1 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -4010,6 +4010,14 @@ static void do_cmd(int c)
} else {
editing = 0;
}
+ // are there other files to edit?
+ j = cmdline_filecnt - optind - 1;
+ if (editing == 0 && j > 0) {
+ editing = 1;
+ modified_count = 0;
+ last_modified_count = -1;
+ status_line_bold("%u more file(s) to edit", j);
+ }
break;
case '^': // ^- move to first non-blank on line
dot_begin();