Merge pull request #5644 from Shougo/vim-7.4.1691

vim-patch:7.4.1691
This commit is contained in:
James McCoy 2016-11-23 21:03:26 -05:00 committed by GitHub
commit 2c154216a4
2 changed files with 4 additions and 2 deletions

View File

@ -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;

View File

@ -753,7 +753,7 @@ static int included_patches[] = {
// 1694 NA
// 1693 NA
// 1692,
// 1691,
1691,
// 1690 NA
// 1689 NA
// 1688 NA