Mercurial > emacs
comparison src/xdisp.c @ 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 | d099dc7dc981 |
children | fd520a2e66ad d9f8d2a65d18 2ecafc6d5db7 |
comparison
equal
deleted
inserted
replaced
70306:470ac698d6f7 | 70307:91d5409c3df8 |
---|---|
8952 | 8952 |
8953 GCPRO1 (tail); | 8953 GCPRO1 (tail); |
8954 update_menu_bar (f, 0); | 8954 update_menu_bar (f, 0); |
8955 #ifdef HAVE_WINDOW_SYSTEM | 8955 #ifdef HAVE_WINDOW_SYSTEM |
8956 update_tool_bar (f, 0); | 8956 update_tool_bar (f, 0); |
8957 #ifdef MAC_OS | |
8958 mac_update_title_bar (f, 0); | |
8959 #endif | |
8957 #endif | 8960 #endif |
8958 UNGCPRO; | 8961 UNGCPRO; |
8959 } | 8962 } |
8960 | 8963 |
8961 unbind_to (count, Qnil); | 8964 unbind_to (count, Qnil); |
8964 { | 8967 { |
8965 struct frame *sf = SELECTED_FRAME (); | 8968 struct frame *sf = SELECTED_FRAME (); |
8966 update_menu_bar (sf, 1); | 8969 update_menu_bar (sf, 1); |
8967 #ifdef HAVE_WINDOW_SYSTEM | 8970 #ifdef HAVE_WINDOW_SYSTEM |
8968 update_tool_bar (sf, 1); | 8971 update_tool_bar (sf, 1); |
8972 #ifdef MAC_OS | |
8973 mac_update_title_bar (sf, 1); | |
8974 #endif | |
8969 #endif | 8975 #endif |
8970 } | 8976 } |
8971 | 8977 |
8972 /* Motif needs this. See comment in xmenu.c. Turn it off when | 8978 /* Motif needs this. See comment in xmenu.c. Turn it off when |
8973 pending_menu_activation is not defined. */ | 8979 pending_menu_activation is not defined. */ |
18518 { | 18524 { |
18519 /* Unibyte case. We don't have to encode, but we have to make | 18525 /* Unibyte case. We don't have to encode, but we have to make |
18520 sure to use a face suitable for unibyte. */ | 18526 sure to use a face suitable for unibyte. */ |
18521 STORE_XCHAR2B (char2b, 0, glyph->u.ch); | 18527 STORE_XCHAR2B (char2b, 0, glyph->u.ch); |
18522 } | 18528 } |
18523 else if (glyph->u.ch < 128 | 18529 else if (glyph->u.ch < 128) |
18524 && glyph->face_id < BASIC_FACE_ID_SENTINEL) | |
18525 { | 18530 { |
18526 /* Case of ASCII in a face known to fit ASCII. */ | 18531 /* Case of ASCII in a face known to fit ASCII. */ |
18527 STORE_XCHAR2B (char2b, 0, glyph->u.ch); | 18532 STORE_XCHAR2B (char2b, 0, glyph->u.ch); |
18528 } | 18533 } |
18529 else | 18534 else |
18921 sure to use a face suitable for unibyte. */ | 18926 sure to use a face suitable for unibyte. */ |
18922 STORE_XCHAR2B (char2b, 0, c); | 18927 STORE_XCHAR2B (char2b, 0, c); |
18923 face_id = FACE_FOR_CHAR (f, face, c); | 18928 face_id = FACE_FOR_CHAR (f, face, c); |
18924 face = FACE_FROM_ID (f, face_id); | 18929 face = FACE_FROM_ID (f, face_id); |
18925 } | 18930 } |
18926 else if (c < 128 && face_id < BASIC_FACE_ID_SENTINEL) | 18931 else if (c < 128) |
18927 { | 18932 { |
18928 /* Case of ASCII in a face known to fit ASCII. */ | 18933 /* Case of ASCII in a face known to fit ASCII. */ |
18929 STORE_XCHAR2B (char2b, 0, c); | 18934 STORE_XCHAR2B (char2b, 0, c); |
18930 } | 18935 } |
18931 else | 18936 else |