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
index 5ea373180a505922b9501363e87e87f4cfdc1ff5..c0e53fa7b4095952d8004daf3e3402f1e17d8159 100644 (file)
--- 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
index b8332bb1b43aa5d25f6e961fa050a3a04e6a3217..165b396c9f087e6836e87a6f18332c7352f9f60d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1236,
 /**/
     1235,
 /**/