From 582b3a9fa819d2d31b2010d3e76324b8dab70f3d Mon Sep 17 00:00:00 2001
From: Protesilaos Stavrou <info@protesilaos.com>
Date: Thu, 16 Apr 2020 13:20:47 +0300
Subject: Make all `defface' syntax more efficient+readable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These changes are informed by the docstring of `defface'.  Specifically:

    As a special exception, in the first element of SPEC, DISPLAY can be
    the special value ‘default’.  Then the ATTS in that element act as
    defaults for all the following elements.

`M-x find-library faces' offers some examples that follow this
pattern, such as `error'.
---
 orderless.el | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/orderless.el b/orderless.el
index 9e0ca24..f082ba6 100644
--- a/orderless.el
+++ b/orderless.el
@@ -52,38 +52,34 @@
   :group 'completion)
 
 (defface orderless-match-face-0
-  '((((class color) (min-colors 88) (background dark))
-     (:foreground "#72a4ff" :weight bold))
-    (((class color) (min-colors 88) (background light))
-     (:foreground "#223fbf" :weight bold))
-    (t :foreground "blue" :weight bold))
+  '((default :weight bold)
+    (((class color) (min-colors 88) (background dark)) :foreground "#72a4ff")
+    (((class color) (min-colors 88) (background light)) :foreground "#223fbf")
+    (t :foreground "blue"))
   "Face for matches of components numbered 0 mod 4."
   :group 'orderless)
 
 (defface orderless-match-face-1
-  '((((class color) (min-colors 88) (background dark))
-     (:foreground "#ed92f8" :weight bold))
-    (((class color) (min-colors 88) (background light))
-     (:foreground "#8f0075" :weight bold))
-    (t :foreground "magenta" :weight bold))
+  '((default :weight bold)
+    (((class color) (min-colors 88) (background dark)) :foreground "#ed92f8")
+    (((class color) (min-colors 88) (background light)) :foreground "#8f0075")
+    (t :foreground "magenta"))
   "Face for matches of components numbered 1 mod 4."
   :group 'orderless)
 
 (defface orderless-match-face-2
-  '((((class color) (min-colors 88) (background dark))
-     (:foreground "#90d800" :weight bold))
-    (((class color) (min-colors 88) (background light))
-     (:foreground "#145a00" :weight bold))
-    (t :foreground "green" :weight bold))
+  '((default :weight bold)
+    (((class color) (min-colors 88) (background dark)) :foreground "#90d800")
+    (((class color) (min-colors 88) (background light)) :foreground "#145a00")
+    (t :foreground "green"))
   "Face for matches of components numbered 2 mod 4."
   :group 'orderless)
 
 (defface orderless-match-face-3
-  '((((class color) (min-colors 88) (background dark))
-     (:foreground "#f0ce43" :weight bold))
-    (((class color) (min-colors 88) (background light))
-     (:foreground "#804000" :weight bold))
-    (t :foreground "yellow" :weight bold))
+  '((default :weight bold)
+    (((class color) (min-colors 88) (background dark)) :foreground "#f0ce43")
+    (((class color) (min-colors 88) (background light)) :foreground "#804000")
+    (t :foreground "yellow"))
   "Face for matches of components numbered 3 mod 4."
   :group 'orderless)
 
-- 
cgit v1.0