diff options
| -rw-r--r-- | src/nvim/buffer.c | 5 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 4 | ||||
| -rw-r--r-- | src/nvim/globals.h | 4 | ||||
| -rw-r--r-- | src/nvim/main.c | 5 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 5ad56ff450..68f6ff303b 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -4533,9 +4533,10 @@ do_arg_all ( use_firstwin = true; } - for (i = 0; i < count && i < opened_len && !got_int; ++i) { - if (alist == &global_alist && i == global_alist.al_ga.ga_len - 1) + for (i = 0; i < count && i < opened_len && !got_int; i++) { + if (alist == &global_alist && i == global_alist.al_ga.ga_len - 1) { arg_had_last = true; + } if (opened[i] > 0) { /* Move the already present window to below the current window */ if (curwin->w_arg_idx != i) { diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index bb23734a7c..f8d4e7d980 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -6567,9 +6567,9 @@ void alist_set(alist_T *al, int count, char_u **files, int use_curbuf, int *fnum xfree(files); } - if (al == &global_alist) + if (al == &global_alist) { arg_had_last = false; - + } recursive--; } diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 3af5040275..2dc8073b1e 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -528,8 +528,8 @@ EXTERN buf_T *curbuf INIT(= NULL); // currently active buffer */ EXTERN alist_T global_alist; /* global argument list */ EXTERN int max_alist_id INIT(= 0); ///< the previous argument list id -EXTERN bool arg_had_last INIT(= false); /* accessed last file in - global_alist */ +EXTERN bool arg_had_last INIT(= false); // accessed last file in + // global_alist EXTERN int ru_col; /* column for ruler */ EXTERN int ru_wid; /* 'rulerfmt' width of ruler when non-zero */ diff --git a/src/nvim/main.c b/src/nvim/main.c index c32fb351ef..371c8d824e 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1624,9 +1624,10 @@ static void edit_buffers(mparm_T *parmp, char_u *cwd) win_close(curwin, true); advance = false; } - if (arg_idx == GARGCOUNT - 1) + if (arg_idx == GARGCOUNT - 1) { arg_had_last = true; - ++arg_idx; + } + arg_idx++; } os_breakcheck(); if (got_int) { |