Mercurial > emacs
changeset 70307:91d5409c3df8
(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.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Mon, 01 May 2006 01:14:09 +0000 |
| parents | 470ac698d6f7 |
| children | 7d6d4101f890 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Mon May 01 01:13:42 2006 +0000 +++ b/src/xdisp.c Mon May 01 01:14:09 2006 +0000 @@ -8954,6 +8954,9 @@ 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 @@ 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 @@ 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 @@ 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);