aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2025-10-16 20:05:41 +0300
committerJuri Linkov2025-10-16 20:05:41 +0300
commitb0078bfa15029a2072bd762e32f472031700fe18 (patch)
treec6f6eb42fea473aea5d4293559e3c3ffd859aa5e
parentbbbad934981cb9b8bf840c6c16301f8091363e70 (diff)
downloademacs-b0078bfa15029a2072bd762e32f472031700fe18.tar.gz
emacs-b0078bfa15029a2072bd762e32f472031700fe18.zip
Improve color contrast of refine-related diff faces on dark backgrounds
* lisp/vc/diff-mode.el (diff-refine-removed, diff-refine-added): * lisp/vc/ediff-init.el (ediff-fine-diff-A, ediff-fine-diff-B): * lisp/vc/smerge-mode.el (smerge-refined-removed, smerge-refined-added): Lower the dominant component of RGB colors from "aa" to "88" (bug#79633).
-rw-r--r--lisp/vc/diff-mode.el4
-rw-r--r--lisp/vc/ediff-init.el4
-rw-r--r--lisp/vc/smerge-mode.el4
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 2fb552597fd..c6c6233485f 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2471,7 +2471,7 @@ With non-nil prefix arg, re-diff all the hunks."
2471 (((class color) (min-colors 88) (background light)) 2471 (((class color) (min-colors 88) (background light))
2472 :background "#ffbbbb") 2472 :background "#ffbbbb")
2473 (((class color) (min-colors 88) (background dark)) 2473 (((class color) (min-colors 88) (background dark))
2474 :background "#aa2222")) 2474 :background "#882222"))
2475 "Face used for removed characters shown by `diff-refine-hunk'." 2475 "Face used for removed characters shown by `diff-refine-hunk'."
2476 :version "24.3") 2476 :version "24.3")
2477 2477
@@ -2483,7 +2483,7 @@ With non-nil prefix arg, re-diff all the hunks."
2483 (((class color) (min-colors 88) (background light)) 2483 (((class color) (min-colors 88) (background light))
2484 :background "#aaffaa") 2484 :background "#aaffaa")
2485 (((class color) (min-colors 88) (background dark)) 2485 (((class color) (min-colors 88) (background dark))
2486 :background "#22aa22")) 2486 :background "#228822"))
2487 "Face used for added characters shown by `diff-refine-hunk'." 2487 "Face used for added characters shown by `diff-refine-hunk'."
2488 :version "24.3") 2488 :version "24.3")
2489 2489
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 12b94e81489..7254b32e41e 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -856,7 +856,7 @@ this variable represents.")
856 '((((class color) (min-colors 88) (background light)) 856 '((((class color) (min-colors 88) (background light))
857 :background "#ffbbbb") 857 :background "#ffbbbb")
858 (((class color) (min-colors 88) (background dark)) 858 (((class color) (min-colors 88) (background dark))
859 :background "#aa2222") 859 :background "#882222")
860 (((class color) (min-colors 16)) 860 (((class color) (min-colors 16))
861 (:foreground "Navy" :background "sky blue")) 861 (:foreground "Navy" :background "sky blue"))
862 (((class color)) 862 (((class color))
@@ -876,7 +876,7 @@ this variable represents.")
876 '((((class color) (min-colors 88) (background light)) 876 '((((class color) (min-colors 88) (background light))
877 :background "#aaffaa") 877 :background "#aaffaa")
878 (((class color) (min-colors 88) (background dark)) 878 (((class color) (min-colors 88) (background dark))
879 :background "#22aa22") 879 :background "#228822")
880 (((class color) (min-colors 16)) 880 (((class color) (min-colors 16))
881 (:foreground "Black" :background "cyan")) 881 (:foreground "Black" :background "cyan"))
882 (((class color)) 882 (((class color))
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 0a9e07cf78b..173b67e1983 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -126,7 +126,7 @@ Used in `smerge-diff-base-upper' and related functions."
126 (((class color) (min-colors 88) (background light)) 126 (((class color) (min-colors 88) (background light))
127 :background "#ffbbbb") 127 :background "#ffbbbb")
128 (((class color) (min-colors 88) (background dark)) 128 (((class color) (min-colors 88) (background dark))
129 :background "#aa2222") 129 :background "#882222")
130 (t :inverse-video t)) 130 (t :inverse-video t))
131 "Face used for removed characters shown by `smerge-refine'." 131 "Face used for removed characters shown by `smerge-refine'."
132 :version "24.3") 132 :version "24.3")
@@ -137,7 +137,7 @@ Used in `smerge-diff-base-upper' and related functions."
137 (((class color) (min-colors 88) (background light)) 137 (((class color) (min-colors 88) (background light))
138 :background "#aaffaa") 138 :background "#aaffaa")
139 (((class color) (min-colors 88) (background dark)) 139 (((class color) (min-colors 88) (background dark))
140 :background "#22aa22") 140 :background "#228822")
141 (t :inverse-video t)) 141 (t :inverse-video t))
142 "Face used for added characters shown by `smerge-refine'." 142 "Face used for added characters shown by `smerge-refine'."
143 :version "24.3") 143 :version "24.3")