branch: elpa/magit
commit 5395798301dfbb6f295c511028f538d94ce7cad7
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
magit-blame--format-string-1: Fix case when FACE is a list
---
CHANGELOG | 3 +++
lisp/magit-blame.el | 6 +-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 967f0cfed80..83e89c73dbd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,9 @@ Bug fixes:
- When adding the commit at point to the completion defaults, it was
assumed that ~minibuffer-default-add-function~ cannot be nil.
+- ~magit-blame--format-string-1~ didn't handle a list of faces
+ correctly.
+
* v4.1.0 2024-09-01
- The library ~git-commit.el~ is no longer distributed as a separate
diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index af960d4186f..56019734b4a 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -683,11 +683,7 @@ modes is toggled, then this mode also gets toggled
automatically.
(propertize format 'font-lock-face face)
(cl-flet* ((p0 (s f)
(propertize s 'font-lock-face
- (if face
- (if (listp face)
- face
- (list f face))
- f)))
+ (if face (cons f (ensure-list face)) f)))
(p1 (k f)
(p0 (cdr (assoc k revinfo)) f))
(p2 (k1 k2 f)
