[vim] 02/139: patch 7.4.1691 Problem: When switching to a new buffer and an autocommand applies syntax highlighting an ml_get error may occur. Solution: Check "syn_buf" against the buffer in the window. (Alexander von Buddenbrock, closes #676)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit b681be175b6991cdc2b8ddd49b0e97e3fe2b201e
Author: Bram Moolenaar <Bram at vim.org>
Date:   Thu Mar 31 23:02:16 2016 +0200

    patch 7.4.1691
    Problem:    When switching to a new buffer and an autocommand applies syntax
                highlighting an ml_get error may occur.
    Solution:   Check "syn_buf" against the buffer in the window. (Alexander von
                Buddenbrock, closes #676)
---
 src/syntax.c  | 4 +++-
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/syntax.c b/src/syntax.c
index 29b6888..a43f4a6 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -509,7 +509,9 @@ 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;
diff --git a/src/version.c b/src/version.c
index 3fa82ca..d08e730 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1691,
+/**/
     1690,
 /**/
     1689,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git