changeset 22456:693b7e5d7f3a v8.2.1776

patch 8.2.1776: filetype.vim may be loaded twice Commit: https://github.com/vim/vim/commit/17bb4d4607a95e13e913519af106f1bf8b26c178 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Sep 30 22:45:39 2020 +0200 patch 8.2.1776: filetype.vim may be loaded twice Problem: Filetype.vim may be loaded twice. Solution: Do "syntax on" after "filetype on". (Adam Stankiewicz, closes #7049)
author Bram Moolenaar <Bram@vim.org>
date Wed, 30 Sep 2020 23:00:04 +0200
parents 8eb75f07f1e0
children 032933c688f0
files runtime/defaults.vim src/version.c
diffstat 2 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -85,17 +85,6 @@ if has('mouse')
   endif
 endif
 
-" Switch syntax highlighting on when the terminal has colors or when using the
-" GUI (which always has colors).
-if &t_Co > 2 || has("gui_running")
-  " Revert with ":syntax off".
-  syntax on
-
-  " I like highlighting strings inside C comments.
-  " Revert with ":unlet c_comment_strings".
-  let c_comment_strings=1
-endif
-
 " Only do this part when Vim was compiled with the +eval feature.
 if 1
 
@@ -124,6 +113,17 @@ if 1
 
 endif
 
+" Switch syntax highlighting on when the terminal has colors or when using the
+" GUI (which always has colors).
+if &t_Co > 2 || has("gui_running")
+  " Revert with ":syntax off".
+  syntax on
+
+  " I like highlighting strings inside C comments.
+  " Revert with ":unlet c_comment_strings".
+  let c_comment_strings=1
+endif
+
 " Convenient command to see the difference between the current buffer and the
 " file it was loaded from, thus the changes you made.
 " Only define it when not defined already.
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1776,
+/**/
     1775,
 /**/
     1774,