aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Blandy1993-05-11 02:48:07 +0000
committerJim Blandy1993-05-11 02:48:07 +0000
commit18004d2b7f3bf740cf90fb507e318e3d83644048 (patch)
treec333b4f329c27756e5887225294d627c6200f8fe /src
parent9dbd4b48c5b89d82dc0e1a19b6938aa04ae550b1 (diff)
downloademacs-18004d2b7f3bf740cf90fb507e318e3d83644048.tar.gz
emacs-18004d2b7f3bf740cf90fb507e318e3d83644048.zip
* xdisp.c (display_text_line): We can't use the FRAME_DEFAULT_FACE
macro here; that's x-specific. Just don't pass the second argument. * xfaces.c (compute_glyph_face): Remove the BASIC_FACE argument; use F's default face.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index d2e8322802e..43dc440ae74 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -732,14 +732,13 @@ compute_char_face (f, w, pos, endptr)
732 FACE_CODE as the face ID, assuming that ordinarily the face would 732 FACE_CODE as the face ID, assuming that ordinarily the face would
733 be BASIC_FACE. F is the frame. */ 733 be BASIC_FACE. F is the frame. */
734int 734int
735compute_glyph_face (f, basic_face, face_code) 735compute_glyph_face (f, face_code)
736 struct frame *f; 736 struct frame *f;
737 struct face *basic_face;
738 int face_code; 737 int face_code;
739{ 738{
740 struct face face; 739 struct face face;
741 740
742 bcopy (basic_face, &face, sizeof (struct face)); 741 bcopy (FRAME_DEFAULT_FACE (f), &face, sizeof (face));
743 742
744 if (face_code >= 0 && face_code < FRAME_N_FACES (f) 743 if (face_code >= 0 && face_code < FRAME_N_FACES (f)
745 && FRAME_FACES (f) [face_code] != 0) 744 && FRAME_FACES (f) [face_code] != 0)