summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/vi.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/editors/vi.c b/editors/vi.c
index c7e7c67..4a7f8c3 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;
}
}