branch: externals/indent-bars
commit a86f8eca12d62a4318a60b27f2a5a68231ca9f11
Author: JD Smith <[email protected]>
Commit: JD Smith <[email protected]>
be more defensive with face-foreground/background
Some faces, including the default highlight, may leave
background (e.g.) unspecified.
---
indent-bars.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indent-bars.el b/indent-bars.el
index 37b7e6b19c..105c292354 100644
--- a/indent-bars.el
+++ b/indent-bars.el
@@ -511,7 +511,7 @@ color of the matching, sorted faces will be returned, unless
FACE-BG is non-nil, in which case the background color is
returned."
(mapcar (lambda (x) (funcall (if face-bg #'face-background #'face-foreground)
- (cdr x) nil t))
+ (cdr x) nil 'default))
(seq-sort-by #'car
(lambda (a b) (cond
((not (numberp b)) t)
@@ -605,7 +605,7 @@ instead of the :blend factor in `indent-bars-color'."
(cl-destructuring-bind (main &key face-bg blend) (indent-bars--style style
"color")
(let ((col (cond ((facep main)
(funcall (if face-bg #'face-background #'face-foreground)
- main))
+ main nil 'default))
((color-defined-p main) main)))
(blend (or blend-override blend)))
(if (and tint tint-blend (color-defined-p tint)) ;tint main color
@@ -648,7 +648,7 @@ See `indent-bars-highlight-current-depth' for
configuration."
(cond
((facep face)
(funcall (if face-bg #'face-background #'face-foreground)
- face))
+ face nil 'default))
((and color (color-defined-p color)) color))))
(cond
;; An explicit palette
