mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3363: when :edit reuses the current buffer the alternate file is set (#19306)

Browse Source 
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 vim/vim#8783)
b8bd2e6eba

Cherry-pick Test_cmdline_expand_special() from patches 8.2.{0243,2873}.
Move Test_cmd_backtick() to the right place.
This commit is contained in:
zeertzjq
2022-07-11 20:55:26 +08:00
committed by GitHub
parent ac10c0f418
commit 5c3bbb67e7
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/ex_cmds.c
View File

@@ -2415,6 +2415,8 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
* Otherwise we re-use the current buffer.
*/
if (other_file) {
const int prev_alt_fnum = curwin->w_alt_fnum;
if (!(flags & (ECMD_ADDBUF | ECMD_ALTBUF))) {
if ((cmdmod.cmod_flags & CMOD_KEEPALT) == 0) {
curwin->w_alt_fnum = curbuf->b_fnum;
@@ -2458,6 +2460,10 @@ int do_ecmd(int fnum, char *ffname, char *sfname, exarg_T *eap, linenr_T newlnum
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;