Merge pull request #14771 from gpanders/colorscheme

fix: source syncolors.vim before startup scripts

1 files changed, 10 insertions, 2 deletions

diff --git a/src/nvim/main.c b/src/nvim/main.c
index 909defe6d0..cf9cb9cfbd 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -366,11 +366,19 @@ int main(int argc, char **argv)
   // Execute --cmd arguments.
   exe_pre_commands(&params);
 
+  // If using the runtime (-u is not NONE), enable syntax & filetype plugins.
+  bool enable_syntax =
+    (params.use_vimrc == NULL || !strequal(params.use_vimrc, "NONE"));
+
+  // Source syncolor.vim to set up default UI highlights
+  if (enable_syntax) {
+    source_runtime((char_u *)"syntax/syncolor.vim", DIP_ALL);
+  }
+
   // Source startup scripts.
   source_startup_scripts(&params);
 
-  // If using the runtime (-u is not NONE), enable syntax & filetype plugins.
-  if (params.use_vimrc == NULL || !strequal(params.use_vimrc, "NONE")) {
+  if (enable_syntax) {
     // Does ":filetype plugin indent on".
     filetype_maybe_enable();
     // Sources syntax/syntax.vim, which calls `:filetype on`.