neovim

Neovim text editor
git clone https://git.dasho.dev/neovim.git
Log | Files | Refs | README
commit d431a4d410f02af2039d7c98e4e33136fd1e4849
parent 2ded2e75f4a6d9a575eeb1600e92c6bb333f8060
Author: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date:   Thu, 21 Dec 2023 14:53:43 +0200

fix(runtime): source old color scheme in bundled color schemes (#26641)

Problem:
Bundled color schemes use `:hi clear` and only define Vim's highlight
groups. This results into Nvim-specific highlight groups using
definitions from Nvim's default color scheme, which are not always
linked to a Vim's highlight group.

Solution:
Restore links to Vim's highlight groups which were present before Nvim's
default color scheme update.
Diffstat:

Mruntime/colors/blue.vim | 3++-


Mruntime/colors/darkblue.vim | 3++-


Mruntime/colors/delek.vim | 3++-


Mruntime/colors/desert.vim | 3++-


Mruntime/colors/elflord.vim | 3++-


Mruntime/colors/evening.vim | 3++-


Mruntime/colors/habamax.vim | 3++-


Mruntime/colors/industry.vim | 3++-


Mruntime/colors/koehler.vim | 3++-


Mruntime/colors/lunaperche.vim | 3++-


Mruntime/colors/morning.vim | 3++-


Mruntime/colors/murphy.vim | 3++-


Mruntime/colors/pablo.vim | 3++-


Mruntime/colors/peachpuff.vim | 3++-


Mruntime/colors/quiet.vim | 3++-


Mruntime/colors/retrobox.vim | 3++-


Mruntime/colors/ron.vim | 3++-


Mruntime/colors/shine.vim | 3++-


Mruntime/colors/slate.vim | 3++-


Mruntime/colors/sorbet.vim | 3++-


Mruntime/colors/torte.vim | 3++-


Mruntime/colors/wildcharm.vim | 3++-


Mruntime/colors/zaibatsu.vim | 3++-


Mruntime/colors/zellner.vim | 3++-


Mruntime/doc/news.txt | 3++-


Mruntime/doc/vim_diff.txt | 5+++--


26 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/runtime/colors/blue.vim b/runtime/colors/blue.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'blue'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'darkblue'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/delek.vim b/runtime/colors/delek.vim
@@ -10,7 +10,8 @@
 
 set background=light
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'delek'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/desert.vim b/runtime/colors/desert.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'desert'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/elflord.vim b/runtime/colors/elflord.vim
@@ -9,7 +9,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'elflord'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'evening'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/habamax.vim b/runtime/colors/habamax.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'habamax'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/industry.vim b/runtime/colors/industry.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'industry'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim
@@ -9,7 +9,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'koehler'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/lunaperche.vim b/runtime/colors/lunaperche.vim
@@ -8,7 +8,8 @@
 
 " Generated by Colortemplate v2.2.3
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'lunaperche'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/morning.vim b/runtime/colors/morning.vim
@@ -10,7 +10,8 @@
 
 set background=light
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'morning'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/murphy.vim b/runtime/colors/murphy.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'murphy'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/pablo.vim b/runtime/colors/pablo.vim
@@ -9,7 +9,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'pablo'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/peachpuff.vim b/runtime/colors/peachpuff.vim
@@ -10,7 +10,8 @@
 
 set background=light
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'peachpuff'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/quiet.vim b/runtime/colors/quiet.vim
@@ -8,7 +8,8 @@
 
 " Generated by Colortemplate v2.2.3
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'quiet'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/retrobox.vim b/runtime/colors/retrobox.vim
@@ -8,7 +8,8 @@
 
 " Generated by Colortemplate v2.2.3
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'retrobox'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/ron.vim b/runtime/colors/ron.vim
@@ -9,7 +9,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'ron'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/shine.vim b/runtime/colors/shine.vim
@@ -10,7 +10,8 @@
 
 set background=light
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'shine'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/slate.vim b/runtime/colors/slate.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'slate'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/sorbet.vim b/runtime/colors/sorbet.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'sorbet'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/torte.vim b/runtime/colors/torte.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'torte'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/wildcharm.vim b/runtime/colors/wildcharm.vim
@@ -8,7 +8,8 @@
 
 " Generated by Colortemplate v2.2.3
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'wildcharm'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/zaibatsu.vim b/runtime/colors/zaibatsu.vim
@@ -10,7 +10,8 @@
 
 set background=dark
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'zaibatsu'
 
 let s:t_Co = &t_Co
diff --git a/runtime/colors/zellner.vim b/runtime/colors/zellner.vim
@@ -10,7 +10,8 @@
 
 set background=light
 
-hi clear
+" hi clear
+source $VIMRUNTIME/colors/vim.lua " Nvim: revert to Vim default color scheme
 let g:colors_name = 'zellner'
 
 let s:t_Co = &t_Co
diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt
@@ -106,7 +106,8 @@ The following changes may require adaptations in user config or plugins.
   This also might result into some color schemes looking differently due to
   them relying on an implicit assumptions about how highlight groups are
   defined by default. To account for this, define all attributes of highlight
-  groups explicitly or use `:colorscheme vim` to restore previous definitions.
+  groups explicitly. Alternatively, use `:colorscheme vim` or
+  `:source $VIMRUNTIME/colors/vim.lua` to restore previous definitions.
 
 • 'termguicolors' is enabled by default when Nvim is able to determine that
   the host terminal emulator supports 24-bit color.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
@@ -32,8 +32,9 @@ Defaults					            *nvim-defaults*
   ":syntax off" to |init.vim|.
 - Default color scheme has been updated. This can result in color schemes
   looking differently due to them relying on how highlight groups are defined
-  by default. Add ":colorscheme vim" to |init.vim| or your color scheme file to
-  restore the old default links and colors.
+  by default. Add ":colorscheme vim" to |init.vim| or
+  ":source $VIMRUNTIME/colors/vim.lua" to your color scheme file to restore
+  the old default links and colors.
 
 - 'autoindent' is enabled
 - 'autoread' is enabled (works in all UIs, including terminal)