fix: use unspecified over nil in smerge faces

To avoid warnings in the Messages buffer
catppuccin · Oct 16, 2024 · 4441d51 · 4441d51
1 parent fb1bf9e
commit 4441d51
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/catppuccin-theme.el b/catppuccin-theme.el
@@ -1190,13 +1190,13 @@ FLAVOR defaults to the value of `catppuccin-flavor'."
          (slime-repl-inputed-output-face :foreground ,ctp-mauve)
 
          ;; smerge
-         (smerge-lower :inherit diff-added :background nil)
-         (smerge-upper :inherit diff-removed :background nil)
+         (smerge-lower :inherit diff-added :background unspecified)
+         (smerge-upper :inherit diff-removed :background unspecified)
          (smerge-refined-added :inherit diff-refine-added
-           :background nil)
+           :background unspecified)
          (smerge-refined-removed :inherit diff-refine-removed
-           :background nil)
-         (smerge-base :inherit diff-refine-changed :background nil)
+           :background unspecified)
+         (smerge-base :inherit diff-refine-changed :background unspecified)
 
          ;; swiper
          ;;(swiper-line-face :inherit swiper-match-face-1)