Mercurial > emacs

comparison src/fontset.c @ 91668:aeadaa72f7b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(free_face_fontset): Use FONTSET_FROM_ID. (syms_of_fontset): Use ASET.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 08 Feb 2008 16:20:29 +0000
parents 53399782ad84
children 507af35dcead
comparison
equal deleted inserted replaced
91667:b3e6289494fb 91668:aeadaa72f7b1
921 FRAME_PTR f; 921 FRAME_PTR f;
922 struct face *face; 922 struct face *face;
923 { 923 {
924 Lisp_Object fontset; 924 Lisp_Object fontset;
925 925
926 fontset = AREF (Vfontset_table, face->fontset); 926 fontset = FONTSET_FROM_ID (face->fontset);
927 xassert (!NILP (fontset) && ! BASE_FONTSET_P (fontset)); 927 xassert (!NILP (fontset) && ! BASE_FONTSET_P (fontset));
928 xassert (f == XFRAME (FONTSET_FRAME (fontset))); 928 xassert (f == XFRAME (FONTSET_FRAME (fontset)));
929 ASET (Vfontset_table, face->fontset, Qnil); 929 ASET (Vfontset_table, face->fontset, Qnil);
930 if (face->fontset < next_fontset_id) 930 if (face->fontset < next_fontset_id)
931 next_fontset_id = face->fontset; 931 next_fontset_id = face->fontset;
2430 Vdefault_fontset = Fmake_char_table (Qfontset, Qnil); 2430 Vdefault_fontset = Fmake_char_table (Qfontset, Qnil);
2431 staticpro (&Vdefault_fontset); 2431 staticpro (&Vdefault_fontset);
2432 FONTSET_ID (Vdefault_fontset) = make_number (0); 2432 FONTSET_ID (Vdefault_fontset) = make_number (0);
2433 FONTSET_NAME (Vdefault_fontset) 2433 FONTSET_NAME (Vdefault_fontset)
2434 = build_string ("-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default"); 2434 = build_string ("-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default");
2435 AREF (Vfontset_table, 0) = Vdefault_fontset; 2435 ASET (Vfontset_table, 0, Vdefault_fontset);
2436 next_fontset_id = 1; 2436 next_fontset_id = 1;
2437 2437
2438 auto_fontset_alist = Qnil; 2438 auto_fontset_alist = Qnil;
2439 staticpro (&auto_fontset_alist); 2439 staticpro (&auto_fontset_alist);
2440 2440