1
0
forked from aniani/vim

patch 8.2.3363: when :edit reuses the current buffer the alternate file is set

Problem:    When :edit reuses the current buffer the alternate file is set to
            the same buffer.
Solution:   Only set the alternate file when not reusing the buffer.
            (closes #8783)
This commit is contained in:
Bram Moolenaar
2021-08-21 17:13:14 +02:00
parent 489d60996d
commit b8bd2e6eba
6 changed files with 12 additions and 4 deletions

View File

@@ -2648,6 +2648,8 @@ do_ecmd(
*/
if (other_file)
{
int prev_alt_fnum = curwin->w_alt_fnum;
if (!(flags & (ECMD_ADDBUF | ECMD_ALTBUF)))
{
if ((cmdmod.cmod_flags & CMOD_KEEPALT) == 0)
@@ -2691,6 +2693,10 @@ do_ecmd(
}
if (buf == NULL)
goto theend;
if (curwin->w_alt_fnum == buf->b_fnum && prev_alt_fnum != 0)
// reusing the buffer, keep the old alternate file
curwin->w_alt_fnum = prev_alt_fnum;
if (buf->b_ml.ml_mfp == NULL) // no memfile yet
{
oldbuf = FALSE;