Mercurial > emacs
comparison src/xfont.c @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | ef719132ddfa |
| children | 9de5a68b57e1 |
comparison
equal
deleted
inserted
replaced
| 112329:e36b2f5d36cd | 112330:56d3e9c28eb0 |
|---|---|
| 1112 xfont_scratch_props = Fmake_vector (make_number (8), Qnil); | 1112 xfont_scratch_props = Fmake_vector (make_number (8), Qnil); |
| 1113 xfont_driver.type = Qx; | 1113 xfont_driver.type = Qx; |
| 1114 register_font_driver (&xfont_driver, NULL); | 1114 register_font_driver (&xfont_driver, NULL); |
| 1115 } | 1115 } |
| 1116 | 1116 |
| 1117 /* arch-tag: 23c5f366-a5ee-44b7-a3b7-90d6da7fd749 | |
| 1118 (do not change this comment) */ |