From: Jim Porter <jporterbugs@gmail.com>
Date: Tue, 5 Sep 2023 04:37:56 +0000 (-0700)
Subject: Inherit 'sieve-mode' faces from 'font-lock'
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f08684ab39dbdc2e9acc3a8288bce7b5675de407;p=emacs.git

Inherit 'sieve-mode' faces from 'font-lock'

These Sieve faces were already a close mapping onto the Font Lock
ones, so this should usually look the same to users with the default
theme.  However, this makes it easier to theme these faces (just
define the usual 'font-lock-*-face' colors you want) and also fixes a
few edge cases (bug#62370).

* lisp/net/sieve-mode.el (sieve-control-commands)
(sieve-action-commands, sieve-test-commands, sieve-tagged-arguments):
Inherit from 'font-lock' faces.
---

diff --git a/lisp/net/sieve-mode.el b/lisp/net/sieve-mode.el
index a54c3c6f103..a1ad0bffddc 100644
--- a/lisp/net/sieve-mode.el
+++ b/lisp/net/sieve-mode.el
@@ -55,39 +55,19 @@
 ;; Font-lock
 
 (defface sieve-control-commands
-  '((((type tty) (class color)) (:foreground "blue" :weight light))
-    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
-    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
-    (((class color) (background light)) (:foreground "Orchid"))
-    (((class color) (background dark)) (:foreground "LightSteelBlue"))
-    (t (:bold t)))
+  '((t :inherit font-lock-builtin-face))
   "Face used for Sieve Control Commands.")
 
 (defface sieve-action-commands
-  '((((type tty) (class color)) (:foreground "blue" :weight bold))
-    (((class color) (background light)) (:foreground "Blue"))
-    (((class color) (background dark)) (:foreground "LightSkyBlue"))
-    (t (:inverse-video t :bold t)))
+  '((t :inherit font-lock-function-name-face))
   "Face used for Sieve Action Commands.")
 
 (defface sieve-test-commands
-  '((((type tty) (class color)) (:foreground "magenta"))
-    (((class grayscale) (background light))
-     (:foreground "LightGray" :bold t :underline t))
-    (((class grayscale) (background dark))
-     (:foreground "Gray50" :bold t :underline t))
-    (((class color) (background light)) (:foreground "CadetBlue"))
-    (((class color) (background dark)) (:foreground "Aquamarine"))
-    (t (:bold t :underline t)))
+  '((t :inherit font-lock-constant-face))
   "Face used for Sieve Test Commands.")
 
 (defface sieve-tagged-arguments
-  '((((type tty) (class color)) (:foreground "cyan" :weight bold))
-    (((class grayscale) (background light)) (:foreground "LightGray" :bold t))
-    (((class grayscale) (background dark)) (:foreground "DimGray" :bold t))
-    (((class color) (background light)) (:foreground "Purple"))
-    (((class color) (background dark)) (:foreground "Cyan"))
-    (t (:bold t)))
+  '((t :inherit font-lock-keyword face))
   "Face used for Sieve Tagged Arguments.")