diff options
| author | Eli Zaretskii | 2019-07-01 19:25:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-07-01 19:25:52 +0300 |
| commit | 50c98fdc0f9a7da65521fa1e4965e2f27b5557d8 (patch) | |
| tree | 606538c796951d910e3e4fabe94b2d931fae7024 | |
| parent | 6b7136a80db3cf85c187084c6aefac156cb8a388 (diff) | |
| download | emacs-50c98fdc0f9a7da65521fa1e4965e2f27b5557d8.tar.gz emacs-50c98fdc0f9a7da65521fa1e4965e2f27b5557d8.zip | |
Fix assertion violations in fontset_find_font
* src/fontset.c (fontset_find_font): Don't assume REPERTORY
must be a fixnum.
| -rw-r--r-- | src/fontset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c index 2c45c95c3a2..137d2895932 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -575,7 +575,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, | |||
| 575 | break; | 575 | break; |
| 576 | repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def)); | 576 | repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def)); |
| 577 | 577 | ||
| 578 | if (XFIXNUM (repertory) == charset_id) | 578 | if (FIXNUMP (repertory) && XFIXNUM_RAW (repertory) == charset_id) |
| 579 | { | 579 | { |
| 580 | charset_matched = i; | 580 | charset_matched = i; |
| 581 | break; | 581 | break; |