Mercurial > emacs
changeset 31507:ac6d049932e9
(Finternal_merge_in_global_face): Return a Lisp object.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Fri, 08 Sep 2000 14:19:31 +0000 |
| parents | a1d733428491 |
| children | 5416fcb729d7 |
| files | src/xfaces.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Fri Sep 08 14:19:11 2000 +0000 +++ b/src/xfaces.c Fri Sep 08 14:19:31 2000 +0000 @@ -4583,6 +4583,8 @@ for (i = 1; i < LFACE_VECTOR_SIZE; ++i) if (! UNSPECIFIEDP (gvec[i])) lvec[i] = gvec[i]; + + return Qnil; } @@ -5671,7 +5673,7 @@ { char *font_name; struct font_name *best; - int i, pt; + int i, pt = 0; int specified[4]; int exact_p;