# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1146446049 0
# Node ID 91d5409c3df8737c765976f2378e7b4168281e16
# Parent  470ac698d6f7bdd1a635cec3ab73498ea7df883b
(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.

diff -r 470ac698d6f7 -r 91d5409c3df8 src/xdisp.c
--- 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);