From 2dc6300f5513b0ff1822a5abf0e3e62173948733 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 9 Jan 2025 11:29:31 +0530
Subject: [PATCH] Fix #8205

---
 kittens/diff/main.go | 8 ++++++++
 kittens/diff/ui.go   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/kittens/diff/main.go b/kittens/diff/main.go
index 0175b89da..174ca28ec 100644
--- a/kittens/diff/main.go
+++ b/kittens/diff/main.go
@@ -111,6 +111,14 @@ func main(_ *cli.Command, opts_ *Options, args []string) (rc int, err error) {
 	if err = set_diff_command(conf.Diff_cmd); err != nil {
 		return 1, err
 	}
+	switch conf.Color_scheme {
+	case Color_scheme_light:
+		use_light_colors = true
+	case Color_scheme_dark:
+		use_light_colors = false
+	case Color_scheme_auto:
+		use_light_colors = false
+	}
 	init_caches()
 	defer func() {
 		for tdir := range remote_dirs {
diff --git a/kittens/diff/ui.go b/kittens/diff/ui.go
index 5f5415522..37cef2b8e 100644
--- a/kittens/diff/ui.go
+++ b/kittens/diff/ui.go
@@ -125,6 +125,7 @@ func set_terminal_colors(lp *loop.Loop) {
 
 func (self *Handler) on_capabilities_received(tc loop.TerminalCapabilities) {
 	var use_dark_colors bool
+	prev := use_light_colors
 	switch conf.Color_scheme {
 	case Color_scheme_auto:
 		use_dark_colors = tc.ColorPreference != loop.LIGHT_COLOR_PREFERENCE
@@ -134,6 +135,9 @@ func (self *Handler) on_capabilities_received(tc loop.TerminalCapabilities) {
 		use_dark_colors = true
 	}
 	use_light_colors = !use_dark_colors
+	if use_light_colors != prev && (light_highlight_started || dark_highlight_started) {
+		self.highlight_all()
+	}
 	set_terminal_colors(self.lp)
 	self.terminal_capabilities_received = true
 	self.draw_screen()