diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-05 20:31:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-05 20:31:19 -0400 |
| commit | f8a5b4bdce489f4df7df15d0b363b608853b92d6 (patch) | |
| tree | f376500b5b2225d0d98871d3ab981a0e590ae31b /src/nvim/ex_cmds.c | |
| parent | c76fc7942b3a88b90c6f0bc7fafabe1f55c7814e (diff) | |
| parent | 674844086b0bc76a8878c6365323afbdb08580d4 (diff) | |
| download | rneovim-f8a5b4bdce489f4df7df15d0b363b608853b92d6.tar.gz rneovim-f8a5b4bdce489f4df7df15d0b363b608853b92d6.tar.bz2 rneovim-f8a5b4bdce489f4df7df15d0b363b608853b92d6.zip | |
Merge pull request #13039 from janlazo/vim-8.2.1790
vim-patch:8.1.{1812,2024,2239,2242,2247,2249,2253},8.2.{354,603,609,665,1570,1790,1792,1801}
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 9be6adcd61..bb4e92efc0 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -2497,8 +2497,12 @@ int do_ecmd( new_name = NULL; } set_bufref(&bufref, buf); - if (p_ur < 0 || curbuf->b_ml.ml_line_count <= p_ur) { - // Save all the text, so that the reload can be undone. + + // If the buffer was used before, store the current contents so that + // the reload can be undone. Do not do this if the (empty) buffer is + // being re-used for another file. + if (!(curbuf->b_flags & BF_NEVERLOADED) + && (p_ur < 0 || curbuf->b_ml.ml_line_count <= p_ur)) { // Sync first so that this is a separate undo-able action. u_sync(false); if (u_savecommon(0, curbuf->b_ml.ml_line_count + 1, 0, true) |