diff options
| author | Chong Yidong | 2008-12-01 18:08:59 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-12-01 18:08:59 +0000 |
| commit | d78494f96281f4f27777b4920727aa7397a31613 (patch) | |
| tree | ad4b82d28efd1b4049ff44bb1c820b166ee80425 /src | |
| parent | 860d96be00ae3ee62ebcf274692e55c23acc8fea (diff) | |
| download | emacs-d78494f96281f4f27777b4920727aa7397a31613.tar.gz emacs-d78494f96281f4f27777b4920727aa7397a31613.zip | |
(realize_x_face): Make abort condition clearer.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 873a7855168..a504ca1c9b1 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -5886,9 +5886,12 @@ realize_x_face (cache, attrs) | |||
| 5886 | realizing the default face, thus the default face should have | 5886 | realizing the default face, thus the default face should have |
| 5887 | already been realized. */ | 5887 | already been realized. */ |
| 5888 | if (fontset == -1) | 5888 | if (fontset == -1) |
| 5889 | fontset = default_face->fontset; | 5889 | { |
| 5890 | if (fontset == -1) | 5890 | if (default_face) |
| 5891 | abort (); | 5891 | fontset = default_face->fontset; |
| 5892 | if (fontset == -1) | ||
| 5893 | abort (); | ||
| 5894 | } | ||
| 5892 | if (! FONT_OBJECT_P (attrs[LFACE_FONT_INDEX])) | 5895 | if (! FONT_OBJECT_P (attrs[LFACE_FONT_INDEX])) |
| 5893 | attrs[LFACE_FONT_INDEX] | 5896 | attrs[LFACE_FONT_INDEX] |
| 5894 | = font_load_for_lface (f, attrs, attrs[LFACE_FONT_INDEX]); | 5897 | = font_load_for_lface (f, attrs, attrs[LFACE_FONT_INDEX]); |