summaryrefslogtreecommitdiff
path: root/src/xfont.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-04-10 22:58:27 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-04-10 22:58:27 -0700
commit9247002884de0c64febb0807db428088800c39ff (patch)
treef96de259de91109b0999e3b4b3a31691346ada9a /src/xfont.c
parent244ed9077fe7ccebbc15c7157cb45832f46a46d3 (diff)
downloademacs-9247002884de0c64febb0807db428088800c39ff.tar.gz
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/xfont.c')
-rw-r--r--src/xfont.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfont.c b/src/xfont.c
index eaa1a3ea59b..5dd6aae3846 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -739,7 +739,7 @@ xfont_open (FRAME_PTR f, Lisp_Object entity, int pixel_size)
So, we try again with wildcards in RESX and RESY. */
Lisp_Object temp;
- temp = Fcopy_font_spec (entity);
+ temp = copy_font_spec (entity);
ASET (temp, FONT_DPI_INDEX, Qnil);
len = font_unparse_xlfd (temp, pixel_size, name, 512);
if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0)