diff options
| author | Paul Eggert <[email protected]> | 2011-04-10 22:58:27 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-04-10 22:58:27 -0700 |
| commit | 9247002884de0c64febb0807db428088800c39ff (patch) | |
| tree | f96de259de91109b0999e3b4b3a31691346ada9a /src/xfaces.c | |
| parent | 244ed9077fe7ccebbc15c7157cb45832f46a46d3 (diff) | |
font.c: Make copy_font_spec and merge_font_spec ordinary C functions.
* font.c (copy_font_spec): Rename from Fcopy_font_spec, since it
was inaccessible from Lisp.
(merge_font_spec): Likewise, renaming from Fmerge_font_spec.
* font.c, font.h, fontset.c, xfaces.c, xfont.c: Change all uses.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 920debf4db..83f4268ad1 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -1793,7 +1793,7 @@ the WIDTH times as wide as FACE on FRAME. */) { /* This is a scalable font. For backward compatibility, we set the specified size. */ - font_entity = Fcopy_font_spec (font_entity); + font_entity = copy_font_spec (font_entity); ASET (font_entity, FONT_SIZE_INDEX, AREF (font_spec, FONT_SIZE_INDEX)); } @@ -2317,9 +2317,9 @@ merge_face_vectors (struct frame *f, Lisp_Object *from, Lisp_Object *to, struct if (!UNSPECIFIEDP (from[i])) { if (!UNSPECIFIEDP (to[i])) - to[i] = Fmerge_font_spec (from[i], to[i]); + to[i] = merge_font_spec (from[i], to[i]); else - to[i] = Fcopy_font_spec (from[i]); + to[i] = copy_font_spec (from[i]); if (! NILP (AREF (to[i], FONT_FOUNDRY_INDEX))) to[LFACE_FOUNDRY_INDEX] = SYMBOL_NAME (AREF (to[i], FONT_FOUNDRY_INDEX)); if (! NILP (AREF (to[i], FONT_FAMILY_INDEX))) |