comparison src/xdisp.c @ 83514:d9f8d2a65d18

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-252 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-253 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-254 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-255 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-256 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-257 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-258 Clean up lisp/gnus/ChangeLog a bit * emacs@sv.gnu.org/emacs--devo--0--patch-259 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-260 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-261 lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t * emacs@sv.gnu.org/emacs--devo--0--patch-262 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-96 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-97 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-98 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-554
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 03 May 2006 11:56:53 +0000
parents 966a40e7fb54 91d5409c3df8
children 1321f6cfb389
comparison
equal deleted inserted replaced
83513:966a40e7fb54 83514:d9f8d2a65d18
8953 8953
8954 GCPRO1 (tail); 8954 GCPRO1 (tail);
8955 update_menu_bar (f, 0); 8955 update_menu_bar (f, 0);
8956 #ifdef HAVE_WINDOW_SYSTEM 8956 #ifdef HAVE_WINDOW_SYSTEM
8957 update_tool_bar (f, 0); 8957 update_tool_bar (f, 0);
8958 #ifdef MAC_OS
8959 mac_update_title_bar (f, 0);
8960 #endif
8958 #endif 8961 #endif
8959 UNGCPRO; 8962 UNGCPRO;
8960 } 8963 }
8961 8964
8962 unbind_to (count, Qnil); 8965 unbind_to (count, Qnil);
8965 { 8968 {
8966 struct frame *sf = SELECTED_FRAME (); 8969 struct frame *sf = SELECTED_FRAME ();
8967 update_menu_bar (sf, 1); 8970 update_menu_bar (sf, 1);
8968 #ifdef HAVE_WINDOW_SYSTEM 8971 #ifdef HAVE_WINDOW_SYSTEM
8969 update_tool_bar (sf, 1); 8972 update_tool_bar (sf, 1);
8973 #ifdef MAC_OS
8974 mac_update_title_bar (sf, 1);
8975 #endif
8970 #endif 8976 #endif
8971 } 8977 }
8972 8978
8973 /* Motif needs this. See comment in xmenu.c. Turn it off when 8979 /* Motif needs this. See comment in xmenu.c. Turn it off when
8974 pending_menu_activation is not defined. */ 8980 pending_menu_activation is not defined. */
18532 { 18538 {
18533 /* Unibyte case. We don't have to encode, but we have to make 18539 /* Unibyte case. We don't have to encode, but we have to make
18534 sure to use a face suitable for unibyte. */ 18540 sure to use a face suitable for unibyte. */
18535 STORE_XCHAR2B (char2b, 0, glyph->u.ch); 18541 STORE_XCHAR2B (char2b, 0, glyph->u.ch);
18536 } 18542 }
18537 else if (glyph->u.ch < 128 18543 else if (glyph->u.ch < 128)
18538 && glyph->face_id < BASIC_FACE_ID_SENTINEL)
18539 { 18544 {
18540 /* Case of ASCII in a face known to fit ASCII. */ 18545 /* Case of ASCII in a face known to fit ASCII. */
18541 STORE_XCHAR2B (char2b, 0, glyph->u.ch); 18546 STORE_XCHAR2B (char2b, 0, glyph->u.ch);
18542 } 18547 }
18543 else 18548 else
18935 sure to use a face suitable for unibyte. */ 18940 sure to use a face suitable for unibyte. */
18936 STORE_XCHAR2B (char2b, 0, c); 18941 STORE_XCHAR2B (char2b, 0, c);
18937 face_id = FACE_FOR_CHAR (f, face, c); 18942 face_id = FACE_FOR_CHAR (f, face, c);
18938 face = FACE_FROM_ID (f, face_id); 18943 face = FACE_FROM_ID (f, face_id);
18939 } 18944 }
18940 else if (c < 128 && face_id < BASIC_FACE_ID_SENTINEL) 18945 else if (c < 128)
18941 { 18946 {
18942 /* Case of ASCII in a face known to fit ASCII. */ 18947 /* Case of ASCII in a face known to fit ASCII. */
18943 STORE_XCHAR2B (char2b, 0, c); 18948 STORE_XCHAR2B (char2b, 0, c);
18944 } 18949 }
18945 else 18950 else