[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 ad491c8: Avoid crashes in 'font-at' after 'set-fo
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 ad491c8: Avoid crashes in 'font-at' after 'set-fontset-font' |
Date: |
Sun, 10 Dec 2017 03:43:43 -0500 (EST) |
branch: emacs-26
commit ad491c80e4b0cfc5be049eb397aa535ed74eade8
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Avoid crashes in 'font-at' after 'set-fontset-font'
* src/fontset.c (free_realized_fontsets): Call
recompute_basic_faces, so that the basic faces are available to
any Lisp that calls this function, e.g. via set-fontset-font.
(Bug#29632)
---
src/fontset.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/fontset.c b/src/fontset.c
index 35586ad..9858001 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1325,6 +1325,10 @@ free_realized_fontsets (Lisp_Object base)
if (CHAR_TABLE_P (this) && EQ (FONTSET_BASE (this), base))
{
Fclear_face_cache (Qt);
+ /* This is in case some Lisp calls this function and then
+ proceeds with calling some other function, like font-at,
+ which needs the basic faces. */
+ recompute_basic_faces (XFRAME (FONTSET_FRAME (this)));
break;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 ad491c8: Avoid crashes in 'font-at' after 'set-fontset-font',
Eli Zaretskii <=