diff options
author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-15 18:20:16 +0400 |
---|---|---|
committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-15 18:20:16 +0400 |
commit | 4e6a86c633a4ca3084a7bc30101f8b4acdd38d28 (patch) | |
tree | 7846fd770e60e97d26a6887306c1e5f8eef1bdd4 /src/fontset.c | |
parent | b6928595db69a78f1cc9a69ae5ba1238b38c0d43 (diff) | |
download | emacs-4e6a86c633a4ca3084a7bc30101f8b4acdd38d28.tar.gz |
Generalize and cleanup font subsystem checks.
* font.h (FONT_DEBUG, font_assert): Remove.
* font.c, fontset.c, w32font.c, xfont.c, xftfont.c: Change
font_assert to eassert. Use eassert where appropriate.
Diffstat (limited to 'src/fontset.c')
-rw-r--r-- | src/fontset.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/fontset.c b/src/fontset.c index d4ce8b08ea3..3c7e931d121 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1027,8 +1027,7 @@ make_fontset_for_ascii_face (FRAME_PTR f, int base_fontset_id, struct face *face base_fontset = FONTSET_FROM_ID (base_fontset_id); if (!BASE_FONTSET_P (base_fontset)) base_fontset = FONTSET_BASE (base_fontset); - if (! BASE_FONTSET_P (base_fontset)) - abort (); + eassert (BASE_FONTSET_P (base_fontset)); } else base_fontset = Vdefault_fontset; @@ -1725,8 +1724,7 @@ fontset_from_font (Lisp_Object font_object) fontset_spec = copy_font_spec (font_spec); ASET (fontset_spec, FONT_REGISTRY_INDEX, alias); name = Ffont_xlfd_name (fontset_spec, Qnil); - if (NILP (name)) - abort (); + eassert (!NILP (name)); fontset = make_fontset (Qnil, name, Qnil); Vfontset_alias_alist = Fcons (Fcons (name, SYMBOL_NAME (alias)), Vfontset_alias_alist); |