aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2000-04-28 12:57:52 +0000
committerKenichi Handa2000-04-28 12:57:52 +0000
commit0badc114185c4f1c84763fe6f0830f061898c34d (patch)
tree4bd30479f6b6a3a6b5da4275828a852d532273e6 /src
parent5dba1e292f9df333096e0d19fdcf0181b814cf46 (diff)
downloademacs-0badc114185c4f1c84763fe6f0830f061898c34d.tar.gz
emacs-0badc114185c4f1c84763fe6f0830f061898c34d.zip
(realize_x_face): Fix the argument of the second
xassert. BASE_FACE may not be a face for ASCII.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 173c0b45c58..d63c8212f8c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4858,7 +4858,7 @@ uncache_face (c, face)
4858 of frame F. The face will be used to display character C. Value 4858 of frame F. The face will be used to display character C. Value
4859 is the ID of the face found. If no suitable face is found, realize 4859 is the ID of the face found. If no suitable face is found, realize
4860 a new one. In that case, if C is a multibyte character, BASE_FACE 4860 a new one. In that case, if C is a multibyte character, BASE_FACE
4861 is a face for ASCII characters that has the same attributes. */ 4861 is a face that has the same attributes. */
4862 4862
4863INLINE int 4863INLINE int
4864lookup_face (f, attr, c, base_face) 4864lookup_face (f, attr, c, base_face)
@@ -5759,10 +5759,10 @@ realize_named_face (f, symbol, id)
5759 5759
5760/* Realize the fully-specified face with attributes ATTRS in face 5760/* Realize the fully-specified face with attributes ATTRS in face
5761 cache CACHE for character C. If C is a multibyte character, 5761 cache CACHE for character C. If C is a multibyte character,
5762 BASE_FACE is a face for ASCII characters that has the same 5762 BASE_FACE is a face that has the same attributes. Otherwise,
5763 attributes. Otherwise, BASE_FACE is ignored. If FORMER_FACE_ID is 5763 BASE_FACE is ignored. If FORMER_FACE_ID is non-negative, it is an
5764 non-negative, it is an ID of face to remove before caching the new 5764 ID of face to remove before caching the new face. Value is a
5765 face. Value is a pointer to the newly created realized face. */ 5765 pointer to the newly created realized face. */
5766 5766
5767static struct face * 5767static struct face *
5768realize_face (cache, attrs, c, base_face, former_face_id) 5768realize_face (cache, attrs, c, base_face, former_face_id)
@@ -5805,12 +5805,12 @@ realize_face (cache, attrs, c, base_face, former_face_id)
5805 5805
5806/* Realize the fully-specified face with attributes ATTRS in face 5806/* Realize the fully-specified face with attributes ATTRS in face
5807 cache CACHE for character C. Do it for X frame CACHE->f. If C is 5807 cache CACHE for character C. Do it for X frame CACHE->f. If C is
5808 a multibyte character, BASE_FACE is a face for ASCII characters 5808 a multibyte character, BASE_FACE is a face that has the same
5809 that has the same attributes. Otherwise, BASE_FACE is ignored. If 5809 attributes. Otherwise, BASE_FACE is ignored. If the new face
5810 the new face doesn't share font with the default face, a fontname 5810 doesn't share font with the default face, a fontname is allocated
5811 is allocated from the heap and set in `font_name' of the new face, 5811 from the heap and set in `font_name' of the new face, but it is not
5812 but it is not yet loaded here. Value is a pointer to the newly 5812 yet loaded here. Value is a pointer to the newly created realized
5813 created realized face. */ 5813 face. */
5814 5814
5815static struct face * 5815static struct face *
5816realize_x_face (cache, attrs, c, base_face) 5816realize_x_face (cache, attrs, c, base_face)
@@ -5826,7 +5826,7 @@ realize_x_face (cache, attrs, c, base_face)
5826 5826
5827 xassert (FRAME_WINDOW_P (cache->f)); 5827 xassert (FRAME_WINDOW_P (cache->f));
5828 xassert (SINGLE_BYTE_CHAR_P (c) 5828 xassert (SINGLE_BYTE_CHAR_P (c)
5829 || (base_face && base_face->ascii_face == base_face)); 5829 || base_face);
5830 5830
5831 /* Allocate a new realized face. */ 5831 /* Allocate a new realized face. */
5832 face = make_realized_face (attrs); 5832 face = make_realized_face (attrs);