branch: externals/fontaine
commit f3a8596f15e5f1afdd39751f0e3b5f75c4119864
Author: Protesilaos Stavrou <[email protected]>
Commit: Protesilaos Stavrou <[email protected]>
Make :line-spacing accept the Emacs 31 cons value of line-spacing
---
fontaine.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fontaine.el b/fontaine.el
index ec147a56d7..84fa9a9bf6 100644
--- a/fontaine.el
+++ b/fontaine.el
@@ -409,7 +409,11 @@ This is then used to restore the last value with the
function
(fontaine--get-face-spec preset face))
fontaine-faces)))
(apply 'custom-theme-set-faces 'fontaine faces)
- (setq-default line-spacing (fontaine--get-preset-property preset
:line-spacing))))
+ (when-let* ((spacing (fontaine--get-preset-property preset :line-spacing))
+ (_ (or (numberp spacing)
+ (and (>= emacs-major-version 31)
+ (consp spacing)))))
+ (setq-default line-spacing spacing))))
(make-obsolete 'fontaine--font-display-hist nil "3.0.0")
