':wq' or ':x' should issue a warning if there are more files to edit,
unless they're followed by '!'.
function old new delta
colon 3911 3960 +49
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 49/0) Total: 49 bytes
Signed-off-by: Ron Yorston <r...@pobox.com>
---
editors/vi.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/editors/vi.c b/editors/vi.c
index 63c7537c2..65ca13b18 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3181,9 +3181,20 @@ static void colon(char *buf)
modified_count = 0;
last_modified_count = -1;
}
- if (cmd[0] == 'x'
- || cmd[1] == 'q' || cmd[1] == 'n'
- ) {
+ if (cmd[1] == 'n') {
+ editing = 0;
+ } else if (cmd[0] == 'x' || cmd[1] == 'q') {
+ // are there other files to edit?
+ int n = cmdline_filecnt - optind - 1;
+ if (n > 0) {
+ if (useforce) {
+ // force end of argv
list
+ optind =
cmdline_filecnt;
+ } else {
+ status_line_bold("%u
more file(s) to edit", n);
+ goto ret;
+ }
+ }
editing = 0;
}
}
--
2.31.1
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
