diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/xfont.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/xfont.c')
| -rw-r--r-- | src/xfont.c | 2 |
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) | |||
| 739 | So, we try again with wildcards in RESX and RESY. */ | 739 | So, we try again with wildcards in RESX and RESY. */ |
| 740 | Lisp_Object temp; | 740 | Lisp_Object temp; |
| 741 | 741 | ||
| 742 | temp = Fcopy_font_spec (entity); | 742 | temp = copy_font_spec (entity); |
| 743 | ASET (temp, FONT_DPI_INDEX, Qnil); | 743 | ASET (temp, FONT_DPI_INDEX, Qnil); |
| 744 | len = font_unparse_xlfd (temp, pixel_size, name, 512); | 744 | len = font_unparse_xlfd (temp, pixel_size, name, 512); |
| 745 | if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0) | 745 | if (len <= 0 || (len = xfont_encode_coding_xlfd (name)) < 0) |