diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-23 21:03:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 21:03:26 -0500 |
| commit | 2c154216a431ca3f5f12e623315f626e2671d2e8 (patch) | |
| tree | d928aaf01b547e20530bb2c220edade7c5eb86ac | |
| parent | e00bc613250b0986aa16a3b4db0ce1ba78da7631 (diff) | |
| parent | 5c06f350cee4d52554194a90e1d070f4f53979d3 (diff) | |
| download | rneovim-2c154216a431ca3f5f12e623315f626e2671d2e8.tar.gz rneovim-2c154216a431ca3f5f12e623315f626e2671d2e8.tar.bz2 rneovim-2c154216a431ca3f5f12e623315f626e2671d2e8.zip | |
Merge pull request #5644 from Shougo/vim-7.4.1691
vim-patch:7.4.1691
| -rw-r--r-- | src/nvim/syntax.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index e57965ac2c..cd37bde3cb 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -392,7 +392,9 @@ void syntax_start(win_T *wp, linenr_T lnum) * Also do this when a change was made, the current state may be invalid * then. */ - if (syn_block != wp->w_s || changedtick != syn_buf->b_changedtick) { + if (syn_block != wp->w_s + || syn_buf != wp->w_buffer + || changedtick != syn_buf->b_changedtick) { invalidate_current_state(); syn_buf = wp->w_buffer; syn_block = wp->w_s; diff --git a/src/nvim/version.c b/src/nvim/version.c index 5339daf9d4..f0f6e964f7 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -753,7 +753,7 @@ static int included_patches[] = { // 1694 NA // 1693 NA // 1692, - // 1691, + 1691, // 1690 NA // 1689 NA // 1688 NA |