diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-30 22:45:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-30 22:45:39 +0200 |
| commit | 17bb4d4607a95e13e913519af106f1bf8b26c178 (patch) | |
| tree | e66f553142b7237a99404abfdd62ab0c5871b439 | |
| parent | 8ec92c977976d9e9225183e36a80e6b0cdbf1f51 (diff) | |
| download | vim-git-17bb4d4607a95e13e913519af106f1bf8b26c178.tar.gz | |
patch 8.2.1776: filetype.vim may be loaded twicev8.2.1776
Problem: Filetype.vim may be loaded twice.
Solution: Do "syntax on" after "filetype on". (Adam Stankiewicz,
closes #7049)
| -rw-r--r-- | runtime/defaults.vim | 22 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/runtime/defaults.vim b/runtime/defaults.vim index e88160402..c15d743c0 100644 --- 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. diff --git a/src/version.c b/src/version.c index 26285fbc4..b3014bb5b 100644 --- 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, |