procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Finternal_merge_in_global_face): Return a Lisp object.

Browse source
This commit is contained in:
Gerd Moellmann 2000-09-08 14:19:31 +00:00
parent ae26e27d7d
commit 334a2e2a82
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xfaces.c
View file

@ -4583,6 +4583,8 @@ Default face attributes override any local face attributes.")
for (i = 1; i < LFACE_VECTOR_SIZE; ++i)
if (! UNSPECIFIEDP (gvec[i]))
lvec[i] = gvec[i];
return Qnil;
}
@ -5671,7 +5673,7 @@ best_matching_font (f, attrs, fonts, nfonts)
{
char *font_name;
struct font_name *best;
int i, pt;
int i, pt = 0;
int specified[4];
int exact_p;