From b8bd2e6ebab03baf2672067067a599df69a278c0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 21 Aug 2021 17:13:14 +0200 Subject: 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) --- src/ex_cmds.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/ex_cmds.c') diff --git a/src/ex_cmds.c b/src/ex_cmds.c index d30db91952..021296d38c 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -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; -- cgit v1.2.3