diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-23 15:19:07 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-23 15:19:07 -0500 |
| commit | aa08632caf80d2259d94e8f6e30cd806e3c05a1d (patch) | |
| tree | fac1e6456a15da2a08a857fdc3c5e2d7fc645af6 /src/nvim/fileio.c | |
| parent | 4f6bb8a9a997aacbe9f9f1ca83e7e4c502bdc03c (diff) | |
| parent | fc0be5b79dfccc582005367da5ee24bd73592879 (diff) | |
| download | rneovim-aa08632caf80d2259d94e8f6e30cd806e3c05a1d.tar.gz rneovim-aa08632caf80d2259d94e8f6e30cd806e3c05a1d.tar.bz2 rneovim-aa08632caf80d2259d94e8f6e30cd806e3c05a1d.zip | |
Merge pull request #1728 from fwalch/small-patches2
vim-patch: Multiple small patches (2)
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 82613f5b07..58e67fa58c 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -3583,6 +3583,12 @@ restore_backup: && (overwriting || vim_strchr(p_cpo, CPO_PLUS) != NULL) ) { unchanged(buf, TRUE); + /* buf->b_changedtick is always incremented in unchanged() but that + * should not trigger a TextChanged event. */ + if (last_changedtick + 1 == buf->b_changedtick + && last_changedtick_buf == buf) { + last_changedtick = buf->b_changedtick; + } u_unchanged(buf); u_update_save_nr(buf); } |