Skip to content

Commit

Permalink
patch 8.2.1776: filetype.vim may be loaded twice
Browse files Browse the repository at this point in the history
Problem:    Filetype.vim may be loaded twice.
Solution:   Do "syntax on" after "filetype on". (Adam Stankiewicz,
            closes #7049)
  • Loading branch information
brammool committed Sep 30, 2020
1 parent 8ec92c9 commit 17bb4d4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
22 changes: 11 additions & 11 deletions runtime/defaults.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1776,
/**/
1775,
/**/
Expand Down

0 comments on commit 17bb4d4

Please sign in to comment.