aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2021-07-22 14:10:56 +0200
committerGitHub <noreply@github.com>2021-07-22 14:10:56 +0200
commitea35584bac6f33d4cb4fd59f5dcd0113e568c5a1 (patch)
tree96ad4635feac01e08b680cf7f70c224b980a5506 /runtime/syntax
parent6f48c018b526a776e38e94f58769c30141de9e0c (diff)
parent0bcf96bf0bf1136aa4fb09dd86461312a2bc4fbb (diff)
downloadrneovim-ea35584bac6f33d4cb4fd59f5dcd0113e568c5a1.tar.gz
rneovim-ea35584bac6f33d4cb4fd59f5dcd0113e568c5a1.tar.bz2
rneovim-ea35584bac6f33d4cb4fd59f5dcd0113e568c5a1.zip
Merge pull request #14771 from gpanders/colorscheme
fix: source syncolors.vim before startup scripts
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/syncolor.vim2
-rw-r--r--runtime/syntax/synload.vim6
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/syntax/syncolor.vim b/runtime/syntax/syncolor.vim
index 5b907a3b83..27cc3360c4 100644
--- a/runtime/syntax/syncolor.vim
+++ b/runtime/syntax/syncolor.vim
@@ -25,6 +25,8 @@ else
endif
endif
+let did_syncolor = 1
+
" Many terminals can only use six different colors (plus black and white).
" Therefore the number of colors used is kept low. It doesn't look nice with
" too many colors anyway.
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 3863a84c1a..aee9ba8b8e 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -14,10 +14,8 @@ endif
" let others know that syntax has been switched on
let syntax_on = 1
-" Set the default highlighting colors. Use a color scheme if specified.
-if exists("colors_name")
- exe "colors " . colors_name
-else
+" Set the default highlighting colors
+if !exists("colors_name") && !exists("did_syncolor")
runtime! syntax/syncolor.vim
endif