aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-03-22 06:28:55 +0800
committerGitHub <noreply@github.com>2024-03-22 06:28:55 +0800
commit50b249930675b4443e95f880a3e4f98f0ee92abf (patch)
treed14085e9665e2763c46ec339262a728391e0a4d0 /src
parent774455dc371736e83afc62eca67ceec3e2dedb5d (diff)
parentdabc44d15c8ef203b16e00dfa93c5e2639680bc4 (diff)
downloadrneovim-50b249930675b4443e95f880a3e4f98f0ee92abf.tar.gz
rneovim-50b249930675b4443e95f880a3e4f98f0ee92abf.tar.bz2
rneovim-50b249930675b4443e95f880a3e4f98f0ee92abf.zip
Merge pull request #27971 from zeertzjq/vim-9.1.0192
vim-patch:9.1.{0192,0195}: drop: don't rewind when editing the same file
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_cmds2.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index a34eb0232b..d754150089 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -866,11 +866,13 @@ void ex_drop(exarg_T *eap)
const int save_ar = curbuf->b_p_ar;
// reload the file if it is newer
- curbuf->b_p_ar = 1;
+ curbuf->b_p_ar = true;
buf_check_timestamp(curbuf);
curbuf->b_p_ar = save_ar;
}
- ex_rewind(eap);
+ if (curbuf->b_ml.ml_flags & ML_EMPTY) {
+ ex_rewind(eap);
+ }
return;
}
}