ivy.el (ivy--reset-state): file-directory-p needs a string

[gnu-emacs-elpa] / colir.el

diff --git a/colir.el b/colir.el
index 7eacbbd12b5f8a913eb486ff414a7abbd60b7af3..792033fca394b5fc38e93782cec6b906f1e1debe 100644 (file)
--- a/colir.el
+++ b/colir.el
@@ -63,7 +63,10 @@
 C1 and C2 are triples of floats in [0.0 1.0] range."
   (apply #'color-rgb-to-hex
          (cl-mapcar
-          colir-compose-method
+          (if (eq (frame-parameter nil 'background-mode) 'dark)
+              ;; this method works nicely for dark themes
+              'colir-compose-soft-light
+            colir-compose-method)
           c1 c2)))
 
 (defun colir-blend-face-background (start end face &optional object)
@@ -74,11 +77,11 @@ Optional argument OBJECT is the string or buffer containing the text.
 See also `font-lock-append-text-property'."
   (let (next prev)
     (while (/= start end)
-      (setq next (next-single-property-change start 'face object end)
-            prev (get-text-property start 'face object))
+      (setq next (next-single-property-change start 'face object end))
+      (setq prev (get-text-property start 'face object))
       (when (listp prev)
         (setq prev (cl-find-if #'atom prev)))
-      (if prev
+      (if (facep prev)
           (let ((background-prev (face-background prev)))
             (progn
               (put-text-property