aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1776: filetype.vim may be loaded twice

Browse Source 
Problem:    Filetype.vim may be loaded twice.
Solution:   Do "syntax on" after "filetype on". (Adam Stankiewicz,
            closes #7049)
This commit is contained in:
Bram Moolenaar 2020-09-30 22:45:39 +02:00
parent 8ec92c9779
commit 17bb4d4607
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/defaults.vim
View File

@ -85,17 +85,6 @@ if has('mouse')
endif endif
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. " Only do this part when Vim was compiled with the +eval feature.
if 1 if 1
@ -124,6 +113,17 @@ if 1
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
" Convenient command to see the difference between the current buffer and the " Convenient command to see the difference between the current buffer and the
" file it was loaded from, thus the changes you made. " file it was loaded from, thus the changes you made.
" Only define it when not defined already. " Only define it when not defined already.

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1776,
/**/ /**/
1775, 1775,
/**/ /**/