[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy-hydra ae9b121 366/395: Avoid face blending errors w
From: |
Basil L. Contovounesios |
Subject: |
[elpa] externals/ivy-hydra ae9b121 366/395: Avoid face blending errors when loading swiper.el |
Date: |
Thu, 25 Feb 2021 08:32:40 -0500 (EST) |
branch: externals/ivy-hydra
commit ae9b121b834a68d11f79ca27b1e5c8790149ba2f
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>
Avoid face blending errors when loading swiper.el
* swiper.el (swiper--recompute-background-faces): Avoid passing nil
to colir-blend, which causes an error while loading swiper.el
Re: #2748.
---
swiper.el | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/swiper.el b/swiper.el
index bca5a47..56f6e43 100644
--- a/swiper.el
+++ b/swiper.el
@@ -108,13 +108,12 @@
swiper-background-match-face-4))
(colir-compose-method #'colir-compose-soft-light))
(cl-mapc (lambda (f1 f2)
- (let ((bg (face-background f1)))
+ (let* ((bg (face-background f1))
+ ;; FIXME: (colir-color-parse "color-22") is nil.
+ (bg (and bg (colir-color-parse bg))))
(when bg
- (set-face-background
- f2
- (colir-blend
- (colir-color-parse bg)
- (colir-color-parse "#ffffff"))))))
+ (setq bg (colir-blend bg (colir-color-parse "#ffffff")))
+ (set-face-background f2 bg))))
swiper-faces
faces)))
(swiper--recompute-background-faces)
- [elpa] externals/ivy-hydra 62815d9 311/395: Makefile: Compile ivy-avy.el, (continued)
- [elpa] externals/ivy-hydra 62815d9 311/395: Makefile: Compile ivy-avy.el, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 7c0796f 333/395: ivy.el (ivy-shrink-after-dispatching): Resize only when in minibuffer, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra a007ba6 334/395: Fix for counsel-grep-like-occur, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra eb53165 313/395: ivy.el (ivy--compute-extra-actions): Dedup on key, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 5d52d4b 352/395: Call isearch-filter-predicate instead of isearch-range-invisible, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 7f88b67 345/395: counsel.el (counsel-highlight-with-face): New action for counsel-faces, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra d52ee0a 301/395: ivy.el (ivy-completion-in-region): Restrict new behavior to elisp code, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 3b1737c 361/395: * counsel.el (counsel-linux-app): Improve prompt., Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 1723799 368/395: Fix M-o 'Wrong type argument: characterp' error, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra fc2801f 367/395: `counsel-find-file': open file in foreground, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra ae9b121 366/395: Avoid face blending errors when loading swiper.el,
Basil L. Contovounesios <=
- [elpa] externals/ivy-hydra 796220b 357/395: ivy.el (ivy-alt-done): Extend to programmed completion, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 911a360 365/395: Consistently use modern face spec syntax, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 74f411d 355/395: Remove Emacs 28 workaround in counsel-descbinds, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 778d8bf 363/395: * counsel.el (counsel-org-files): Simplify regexp., Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra ab36ccb 364/395: * counsel.el (counsel-org-files): Fix regexp., Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra b65e401 351/395: counsel.el (counsel-file-jump-from-find): Add and bind to "`", Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra c6b60d3 337/395: counsel.el (counsel-ag): Prompt for args on a double universal-argument, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra d18ec97 338/395: counsel.el (compile-command): better handle our metadata, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra d321048 358/395: ivy.el (ivy-add-prompt-count): Simplify, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 96b433d 369/395: Handle Windows directory separator in ivy-occur, Basil L. Contovounesios, 2021/02/25