From 87f29ee239919c5ce6b9e1caf89aa3a3f19336af Mon Sep 17 00:00:00 2001 From: Nathan Moreau Date: Fri, 9 Oct 2020 15:13:02 +0200 Subject: [PATCH] Simplify using let*. --- nord-theme.el | 78 +++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/nord-theme.el b/nord-theme.el index fbceb89..2baf454 100644 --- a/nord-theme.el +++ b/nord-theme.el @@ -98,45 +98,45 @@ (or (= (display-color-cells) 16777216) (display-graphic-p))) ;;;; Color Constants -(let ((class '((class color) (min-colors 89))) - (nord0 (if (nord-display-truecolor-or-graphic-p) "#2E3440" nil)) - (nord1 (if (nord-display-truecolor-or-graphic-p) "#3B4252" "black")) - (nord2 (if (nord-display-truecolor-or-graphic-p) "#434C5E" "#434C5E")) - (nord3 (if (nord-display-truecolor-or-graphic-p) "#4C566A" "brightblack")) - (nord4 (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9")) - (nord5 (if (nord-display-truecolor-or-graphic-p) "#E5E9F0" "white")) - (nord6 (if (nord-display-truecolor-or-graphic-p) "#ECEFF4" "brightwhite")) - (nord7 (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan")) - (nord8 (if (nord-display-truecolor-or-graphic-p) "#88C0D0" "brightcyan")) - (nord9 (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) - (nord10 (if (nord-display-truecolor-or-graphic-p) "#5E81AC" "brightblue")) - (nord11 (if (nord-display-truecolor-or-graphic-p) "#BF616A" "red")) - (nord12 (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow")) - (nord13 (if (nord-display-truecolor-or-graphic-p) "#EBCB8B" "yellow")) - (nord14 (if (nord-display-truecolor-or-graphic-p) "#A3BE8C" "green")) - (nord15 (if (nord-display-truecolor-or-graphic-p) "#B48EAD" "magenta")) - (nord-annotation (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow")) - (nord-attribute (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan")) - (nord-class (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan")) - (nord-comment (if (nord-display-truecolor-or-graphic-p) (nord-theme--brightened-comment-color nord-comment-brightness) "brightblack")) - (nord-escape (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow")) - (nord-method (if (nord-display-truecolor-or-graphic-p) "#88C0D0" "brightcyan")) - (nord-keyword (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) - (nord-numeric (if (nord-display-truecolor-or-graphic-p) "#B48EAD" "magenta")) - (nord-operator (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) - (nord-preprocessor (if (nord-display-truecolor-or-graphic-p) "#5E81AC" "brightblue")) - (nord-punctuation (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9")) - (nord-regexp (if (nord-display-truecolor-or-graphic-p) "#EBCB8B" "yellow")) - (nord-string (if (nord-display-truecolor-or-graphic-p) "#A3BE8C" "green")) - (nord-tag (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) - (nord-variable (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9")) - (nord-region-highlight-foreground (if (or - (string= nord-region-highlight "frost") - (string= nord-region-highlight "snowstorm")) "#2E3440" nil)) - (nord-region-highlight-background (if - (string= nord-region-highlight "frost") "#88C0D0" - (if (string= nord-region-highlight "snowstorm") "#D8DEE9" "#434C5E"))) - (nord-uniform-mode-lines-background (if nord-uniform-mode-lines "#4C566A" "#3B4252"))) +(let* ((class '((class color) (min-colors 89))) + (nord0 (if (nord-display-truecolor-or-graphic-p) "#2E3440" nil)) + (nord1 (if (nord-display-truecolor-or-graphic-p) "#3B4252" "black")) + (nord2 (if (nord-display-truecolor-or-graphic-p) "#434C5E" "#434C5E")) + (nord3 (if (nord-display-truecolor-or-graphic-p) "#4C566A" "brightblack")) + (nord4 (if (nord-display-truecolor-or-graphic-p) "#D8DEE9" "#D8DEE9")) + (nord5 (if (nord-display-truecolor-or-graphic-p) "#E5E9F0" "white")) + (nord6 (if (nord-display-truecolor-or-graphic-p) "#ECEFF4" "brightwhite")) + (nord7 (if (nord-display-truecolor-or-graphic-p) "#8FBCBB" "cyan")) + (nord8 (if (nord-display-truecolor-or-graphic-p) "#88C0D0" "brightcyan")) + (nord9 (if (nord-display-truecolor-or-graphic-p) "#81A1C1" "blue")) + (nord10 (if (nord-display-truecolor-or-graphic-p) "#5E81AC" "brightblue")) + (nord11 (if (nord-display-truecolor-or-graphic-p) "#BF616A" "red")) + (nord12 (if (nord-display-truecolor-or-graphic-p) "#D08770" "brightyellow")) + (nord13 (if (nord-display-truecolor-or-graphic-p) "#EBCB8B" "yellow")) + (nord14 (if (nord-display-truecolor-or-graphic-p) "#A3BE8C" "green")) + (nord15 (if (nord-display-truecolor-or-graphic-p) "#B48EAD" "magenta")) + (nord-annotation nord12) + (nord-attribute nord7) + (nord-class nord7) + (nord-comment (if (nord-display-truecolor-or-graphic-p) (nord-theme--brightened-comment-color nord-comment-brightness) "brightblack")) + (nord-escape nord12) + (nord-method nord8) + (nord-keyword nord9) + (nord-numeric nord15) + (nord-operator nord9) + (nord-preprocessor nord10) + (nord-punctuation nord4) + (nord-regexp nord13) + (nord-string nord14) + (nord-tag nord9) + (nord-variable nord4) + (nord-region-highlight-foreground (if (or + (string= nord-region-highlight "frost") + (string= nord-region-highlight "snowstorm")) "#2E3440" nil)) + (nord-region-highlight-background (if + (string= nord-region-highlight "frost") "#88C0D0" + (if (string= nord-region-highlight "snowstorm") "#D8DEE9" "#434C5E"))) + (nord-uniform-mode-lines-background (if nord-uniform-mode-lines "#4C566A" "#3B4252"))) ;;;; +------------+ ;;;; + Core Faces +