thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1763: :argedit does not reuse an empty unnamed buffer

Browse Source 
Problem:    :argedit does not reuse an empty unnamed buffer.
Solution:   Add the BLN_CURBUF flag and fix all the side effects. (Christian
            Brabandt, closes #2713)
This commit is contained in:
Bram Moolenaar
2018-04-24 21:58:51 +02:00
parent b255b90503
commit 46a53dfc29
6 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ex_cmds2.c
View File

@@ -2941,6 +2941,8 @@ ex_next(exarg_T *eap)
ex_argedit(exarg_T *eap)
{
int i = eap->addr_count ? (int)eap->line2 : curwin->w_arg_idx + 1;
// Whether curbuf will be reused, curbuf->b_ffname will be set.
int curbuf_is_reusable = curbuf_reusable();
if (do_arglist(eap->arg, AL_ADD, i) == FAIL)
return;
@@ -2948,8 +2950,9 @@ ex_argedit(exarg_T *eap)
maketitle();
#endif
if (curwin->w_arg_idx == 0 && (curbuf->b_ml.ml_flags & ML_EMPTY)
&& curbuf->b_ffname == NULL)
if (curwin->w_arg_idx == 0
&& (curbuf->b_ml.ml_flags & ML_EMPTY)
&& (curbuf->b_ffname == NULL || curbuf_is_reusable))
i = 0;
/* Edit the argument. */
if (i < ARGCOUNT)
@@ -3281,7 +3284,8 @@ alist_add_list(
for (i = 0; i < count; ++i)
{
ARGLIST[after + i].ae_fname = files[i];
ARGLIST[after + i].ae_fnum = buflist_add(files[i], BLN_LISTED);
ARGLIST[after + i].ae_fnum =
buflist_add(files[i], BLN_LISTED | BLN_CURBUF);
}
ALIST(curwin)->al_ga.ga_len += count;
if (old_argcount > 0 && curwin->w_arg_idx >= after)