Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix face colour should not be nil in emacs-29+ #132

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+6 −2
Open

Fix face colour should not be nil in emacs-29+ #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions nord-theme.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,13 @@
"Returns whether the display can display nord colors"
(or (= (display-color-cells) 16777216) (display-graphic-p)))

;; Starting with emacs-29, nil should not be used for face colours.
;; Using unspecified instead.
(setq nord--unspec (when (>= emacs-major-version 29) 'unspecified))

;;;; Color Constants
(let ((class '((class color) (min-colors 89)))
(nord0 (if (nord-display-truecolor-or-graphic-p) "#2E3440" nil))
(nord0 (if (nord-display-truecolor-or-graphic-p) "#2E3440" nord--unspec))
(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"))
Expand Down Expand Up @@ -131,7 +135,7 @@
(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))
(string= nord-region-highlight "snowstorm")) "#2E3440" nord--unspec))
(nord-region-highlight-background (if
(string= nord-region-highlight "frost") "#88C0D0"
(if (string= nord-region-highlight "snowstorm") "#D8DEE9" "#434C5E")))
Expand Down