From 15ba779363ab1069b0ddba682de844246e78a72b Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 1 May 2006 01:14:09 +0000 Subject: [PATCH] (prepare_menu_bars) [MAC_OS]: Call mac_update_title_bar. (get_glyph_face_and_encoding, get_char_face_and_encoding): Don't distinguish known faces from others. --- src/xdisp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 65b16da76c3..ecc097343f2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -8954,6 +8954,9 @@ prepare_menu_bars () update_menu_bar (f, 0); #ifdef HAVE_WINDOW_SYSTEM update_tool_bar (f, 0); +#ifdef MAC_OS + mac_update_title_bar (f, 0); +#endif #endif UNGCPRO; } @@ -8966,6 +8969,9 @@ prepare_menu_bars () update_menu_bar (sf, 1); #ifdef HAVE_WINDOW_SYSTEM update_tool_bar (sf, 1); +#ifdef MAC_OS + mac_update_title_bar (sf, 1); +#endif #endif } @@ -18520,8 +18526,7 @@ get_glyph_face_and_encoding (f, glyph, char2b, two_byte_p) sure to use a face suitable for unibyte. */ STORE_XCHAR2B (char2b, 0, glyph->u.ch); } - else if (glyph->u.ch < 128 - && glyph->face_id < BASIC_FACE_ID_SENTINEL) + else if (glyph->u.ch < 128) { /* Case of ASCII in a face known to fit ASCII. */ STORE_XCHAR2B (char2b, 0, glyph->u.ch); @@ -18923,7 +18928,7 @@ get_char_face_and_encoding (f, c, face_id, char2b, multibyte_p, display_p) face_id = FACE_FOR_CHAR (f, face, c); face = FACE_FROM_ID (f, face_id); } - else if (c < 128 && face_id < BASIC_FACE_ID_SENTINEL) + else if (c < 128) { /* Case of ASCII in a face known to fit ASCII. */ STORE_XCHAR2B (char2b, 0, c); -- 2.39.5