From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 27 Jan 2025 06:47:29 +0000 (+0100)
Subject: Don't use obsolete face alias in themes
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ffe303a498c4e739f907dc870bfe98e2806491ed;p=emacs.git

Don't use obsolete face alias in themes

* etc/themes/leuven-dark-theme.el:
* etc/themes/leuven-theme.el:
* etc/themes/manoj-dark-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/tango-theme.el: Don't use obsolete face alias
'smerge-refined-change', preferring instead 'smerge-refined-changed'.

(cherry picked from commit b06364f1b667e7960d1724293398179f280e910b)
---

diff --git a/etc/themes/leuven-dark-theme.el b/etc/themes/leuven-dark-theme.el
index 29aa7b224f3..4cf30fc6e1e 100644
--- a/etc/themes/leuven-dark-theme.el
+++ b/etc/themes/leuven-dark-theme.el
@@ -333,7 +333,7 @@ more..."
    `(smerge-other ((,class ,diff-added)))
    `(smerge-base ((,class ,diff-removed)))
    `(smerge-markers ((,class (:background "#253859"))))
-   `(smerge-refined-change ((,class (:background "#5a550b"))))
+   `(smerge-refined-changed ((,class (:background "#5a550b"))))
 
    ;; Ediff.
    `(ediff-current-diff-A ((,class (:background "#253f49"))))
diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el
index f5bf9c5179e..71704c4b01e 100644
--- a/etc/themes/leuven-theme.el
+++ b/etc/themes/leuven-theme.el
@@ -359,7 +359,7 @@ more..."
    `(smerge-other ((,class ,diff-added)))
    `(smerge-base ((,class ,diff-removed)))
    `(smerge-markers ((,class (:background "#FFE5CC"))))
-   `(smerge-refined-change ((,class (:background "#AAAAFF"))))
+   `(smerge-refined-changed ((,class (:background "#AAAAFF"))))
 
    ;; Ediff.
    `(ediff-current-diff-A ((,class (:background "#FFDDDD"))))
diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el
index 5612a4de3fa..9c6798ab324 100644
--- a/etc/themes/manoj-dark-theme.el
+++ b/etc/themes/manoj-dark-theme.el
@@ -639,7 +639,7 @@ jarring angry fruit salad look to reduce eye fatigue."
  '(smerge-markers ((t (:background "grey30"))))
  '(smerge-mine ((t (:foreground "cyan"))))
  '(smerge-other ((t (:foreground "lightgreen"))))
- '(smerge-refined-change ((t (:background "blue4"))))
+ '(smerge-refined-changed ((t (:background "blue4"))))
  '(speedbar-button-face ((t (:foreground "green3"))))
  '(speedbar-directory-face ((t (:foreground "light blue"))))
  '(speedbar-file-face ((t (:foreground "cyan"))))
diff --git a/etc/themes/tango-dark-theme.el b/etc/themes/tango-dark-theme.el
index 0119eba3d78..d0fa2dff49f 100644
--- a/etc/themes/tango-dark-theme.el
+++ b/etc/themes/tango-dark-theme.el
@@ -135,7 +135,7 @@ Semantic, and Ansi-Color faces are included."
    `(message-cited-text ((,class (:foreground ,cham-1))))
    `(message-separator ((,class (:foreground ,plum-1))))
    ;; SMerge faces
-   `(smerge-refined-change ((,class (:background ,blue-3))))
+   `(smerge-refined-changed ((,class (:background ,blue-3))))
    ;; Ediff faces
    `(ediff-current-diff-A ((,class (:background ,alum-5))))
    `(ediff-fine-diff-A ((,class (:background ,blue-3))))
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index 498f3bbb07c..9b276466d95 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -121,7 +121,7 @@ Semantic, and Ansi-Color faces are included."
    `(message-cited-text ((,class (:slant italic :foreground ,alum-5))))
    `(message-separator ((,class (:weight bold :foreground ,cham-3))))
    ;; SMerge
-   `(smerge-refined-change ((,class (:background ,plum-1))))
+   `(smerge-refined-changed ((,class (:background ,plum-1))))
    ;; Ediff
    `(ediff-current-diff-A ((,class (:background ,blue-1))))
    `(ediff-fine-diff-A ((,class (:background ,plum-1))))