Mercurial > hg > xemacs-beta
comparison src/objects-xlike-inc.c @ 3680:efca49973324
[xemacs-hg @ 2006-11-15 21:12:13 by aidan]
Add a GCPRO; move around a warn_when_safe call to make me feel better about
garbage collection.
author | aidan |
---|---|
date | Wed, 15 Nov 2006 21:12:17 +0000 |
parents | 3ef0aaf3dc34 |
children | 5989b9bbb612 |
comparison
equal
deleted
inserted
replaced
3679:9ea601619457 | 3680:efca49973324 |
---|---|
793 | 793 |
794 if (!have_latin1) | 794 if (!have_latin1) |
795 { | 795 { |
796 Lisp_Object new_registries = make_vector(registries_len + 1, Qnil); | 796 Lisp_Object new_registries = make_vector(registries_len + 1, Qnil); |
797 | 797 |
798 warn_when_safe (Qface, Qwarning, | |
799 "Your ASCII charset registries contain nothing " | |
800 "sensible. Adding `" FALLBACK_ASCII_REGISTRY "'."); | |
801 | |
802 XVECTOR_DATA(new_registries)[0] | 798 XVECTOR_DATA(new_registries)[0] |
803 = build_string(FALLBACK_ASCII_REGISTRY); | 799 = build_string(FALLBACK_ASCII_REGISTRY); |
804 | 800 |
805 memcpy(XVECTOR_DATA(new_registries) + 1, | 801 memcpy(XVECTOR_DATA(new_registries) + 1, |
806 XVECTOR_DATA(registries), | 802 XVECTOR_DATA(registries), |
810 /* Calling set_charset_registries instead of overwriting the | 806 /* Calling set_charset_registries instead of overwriting the |
811 value directly, to allow the charset font caches to be | 807 value directly, to allow the charset font caches to be |
812 invalidated and a change to the default face to be | 808 invalidated and a change to the default face to be |
813 noted. */ | 809 noted. */ |
814 set_charset_registries(charset, new_registries); | 810 set_charset_registries(charset, new_registries); |
811 | |
812 warn_when_safe (Qface, Qwarning, | |
813 "Your ASCII charset registries contain nothing " | |
814 "sensible. Adding `" FALLBACK_ASCII_REGISTRY "'."); | |
815 | 815 |
816 /* And recurse. */ | 816 /* And recurse. */ |
817 result = | 817 result = |
818 DEVMETH_OR_GIVEN (XDEVICE (device), find_charset_font, | 818 DEVMETH_OR_GIVEN (XDEVICE (device), find_charset_font, |
819 (device, font, charset, stage), | 819 (device, font, charset, stage), |