aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-05-04 22:03:37 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-05-04 22:03:37 -0400
commit22ea7be77b8739722efe3bedaa8b16a8c5d89cba (patch)
tree26e37c30a1fe20e6b9b81aff80597be20e0e3b5a /runtime/syntax
parent1bbe513591fd1366c6e029d952334c2f0b4e2bcb (diff)
parentee4d1f2ccea1d1d6158f5781caa12dfcc1aad11d (diff)
downloadrneovim-22ea7be77b8739722efe3bedaa8b16a8c5d89cba.tar.gz
rneovim-22ea7be77b8739722efe3bedaa8b16a8c5d89cba.tar.bz2
rneovim-22ea7be77b8739722efe3bedaa8b16a8c5d89cba.zip
Merge pull request #4540 from KillTheMule/vim-patch-1236
vim-patch: 7.4.1236
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/manual.vim11
1 files changed, 6 insertions, 5 deletions
diff --git a/runtime/syntax/manual.vim b/runtime/syntax/manual.vim
index 5ea373180a..c0e53fa7b4 100644
--- 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'.