# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454364006 -3600
# Node ID 895150cd3e6ffd43bd325984ec187cfe17387b7d
# Parent  b50837349dc99b975996de49fed27fdba17006b9
commit https://github.com/vim/vim/commit/885f24fbcae2a39ae496ffb3a1e139379be8fae1
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Feb 1 22:54:46 2016 +0100

    patch 7.4.1236
    Problem:    When "syntax manual" was used switching between buffers removes
                the highlighting.
    Solution:   Set the syntax option without changing the value. (Anton
                Lindqvist)

diff --git a/runtime/syntax/manual.vim b/runtime/syntax/manual.vim
--- a/runtime/syntax/manual.vim
+++ b/runtime/syntax/manual.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2008 Jan 26
+" Last Change:	2016 Feb 01
 
 " This file is used for ":syntax manual".
 " It installs the Syntax autocommands, but no the FileType autocommands.
@@ -16,10 +16,11 @@ endif
 
 let syntax_manual = 1
 
-" Remove the connection between FileType and Syntax autocommands.
-if exists('#syntaxset')
-  au! syntaxset FileType
-endif
+" Overrule the connection between FileType and Syntax autocommands.  This sets
+" the syntax when the file type is detected, without changing the value.
+augroup syntaxset
+  au! FileType *	exe "set syntax=" . &syntax
+augroup END
 
 " If the GUI is already running, may still need to install the FileType menu.
 " Don't do it when the 'M' flag is included in 'guioptions'.
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1236,
+/**/
     1235,
 /**/
     1234,