Mercurial > emacs

comparison src/xfaces.c @ 88939:13e20ef7c935

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(font_name_registry, choose_face_font): Delete unused vars. (try_font_list): Declare an arg.
author Dave Love <fx@gnu.org>
date Tue, 30 Jul 2002 11:38:05 +0000
parents eca48744527f
children 3b6234eb229c
comparison
equal deleted inserted replaced
88938:639d0c1fb10e 88939:13e20ef7c935
2174 2174
2175 Lisp_Object 2175 Lisp_Object
2176 font_name_registry (fontname) 2176 font_name_registry (fontname)
2177 Lisp_Object fontname; 2177 Lisp_Object fontname;
2178 { 2178 {
2179 Lisp_Object registry;
2180 struct font_name font; 2179 struct font_name font;
2181 char *p;
2182 2180
2183 font.name = LSTRDUPA (fontname); 2181 font.name = LSTRDUPA (fontname);
2184 if (! split_font_name (NULL, &font, 0)) 2182 if (! split_font_name (NULL, &font, 0))
2185 return Qnil; 2183 return Qnil;
2186 font.fields[XLFD_ENCODING][-1] = '-'; 2184 font.fields[XLFD_ENCODING][-1] = '-';
6121 the fonts matched. Value is the number of fonts found. */ 6119 the fonts matched. Value is the number of fonts found. */
6122 6120
6123 static int 6121 static int
6124 try_font_list (f, pattern, family, registry, fonts) 6122 try_font_list (f, pattern, family, registry, fonts)
6125 struct frame *f; 6123 struct frame *f;
6126 Lisp_Object family, registry; 6124 Lisp_Object pattern, family, registry;
6127 struct font_name **fonts; 6125 struct font_name **fonts;
6128 { 6126 {
6129 int nfonts = 0; 6127 int nfonts = 0;
6130 6128
6131 if (STRINGP (pattern)) 6129 if (STRINGP (pattern))
6194 choose_face_font (f, attrs, font_spec) 6192 choose_face_font (f, attrs, font_spec)
6195 struct frame *f; 6193 struct frame *f;
6196 Lisp_Object *attrs; 6194 Lisp_Object *attrs;
6197 Lisp_Object font_spec; 6195 Lisp_Object font_spec;
6198 { 6196 {
6199 Lisp_Object val;
6200 Lisp_Object pattern, family, adstyle, registry; 6197 Lisp_Object pattern, family, adstyle, registry;
6201 Lisp_Object new_attrs[LFACE_VECTOR_SIZE];
6202 char *font_name = NULL; 6198 char *font_name = NULL;
6203 struct font_name *fonts; 6199 struct font_name *fonts;
6204 int nfonts; 6200 int nfonts;
6205 6201
6206 /* If we are choosing an ASCII font and a font name is explicitly 6202 /* If we are choosing an ASCII font and a font name is explicitly