aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/fileio.c2
-rw-r--r--src/nvim/options.lua2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 53878e4652..5ddb3952de 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -3570,6 +3570,8 @@ restore_backup:
unchanged(buf, true);
const varnumber_T changedtick = buf_get_changedtick(buf);
if (buf->b_last_changedtick + 1 == changedtick) {
+ // changedtick is always incremented in unchanged() but that
+ // should not trigger a TextChanged event.
buf->b_last_changedtick = changedtick;
}
u_unchanged(buf);
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 30ddb977bb..5ae306e00e 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2123,7 +2123,7 @@ return {
type='string', list='flags', scope={'global'},
vim=true,
varname='p_shm',
- defaults={if_true={vi="", vim="filnxtToO"}}
+ defaults={if_true={vi="", vim="filnxtToOF"}}
},
{
full_name='showbreak', abbreviation='sbr',