diff options
| author | Joakim Verona | 2011-08-08 17:08:48 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-08-08 17:08:48 +0200 |
| commit | 1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de (patch) | |
| tree | cf8b108fccada9dca76dc616e5333739d8825728 /src/ftfont.c | |
| parent | 23e9910c1fc51657f08b4ab125c0c44e5860d942 (diff) | |
| parent | d56176114c8c9226a43db4bf68df562486e454ed (diff) | |
| download | emacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.tar.gz emacs-1e3f7bd2cdb85abfbf572cc1a13e615e5c4299de.zip | |
merge upstream
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 4e313a89021..5c98073057c 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -214,6 +214,10 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) | |||
| 214 | 214 | ||
| 215 | for (i = 0; i < FONT_OBJLIST_INDEX; i++) | 215 | for (i = 0; i < FONT_OBJLIST_INDEX; i++) |
| 216 | ASET (val, i, AREF (entity, i)); | 216 | ASET (val, i, AREF (entity, i)); |
| 217 | |||
| 218 | ASET (val, FONT_EXTRA_INDEX, Fcopy_sequence (extra)); | ||
| 219 | font_put_extra (val, QCfont_entity, key); | ||
| 220 | |||
| 217 | return val; | 221 | return val; |
| 218 | } | 222 | } |
| 219 | entity = font_make_entity (); | 223 | entity = font_make_entity (); |