diff options
| author | Jason Rumney | 2007-05-31 23:40:51 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-05-31 23:40:51 +0000 |
| commit | 8252315559e01d36fa4fce7e1c22aec485c18822 (patch) | |
| tree | 099a0c48b371e54405e86f5e42dece084c25c8bf /src | |
| parent | 7add47cb70598f62e805ba22ff994aa21cabba4b (diff) | |
| download | emacs-8252315559e01d36fa4fce7e1c22aec485c18822.tar.gz emacs-8252315559e01d36fa4fce7e1c22aec485c18822.zip | |
(x_default_font_parameter): Use new style font name.
(Fx_create_frame, x_create_tip_frame): Initialize resx and resy.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 977d6a13333..d3e0dc1be15 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -4147,7 +4147,7 @@ x_default_font_parameter (f, parms) | |||
| 4147 | { | 4147 | { |
| 4148 | int i; | 4148 | int i; |
| 4149 | static char *names[] | 4149 | static char *names[] |
| 4150 | = { "-*-Courier New-normal-r-*-*-*-100-*-*-c-*-iso8859-1", | 4150 | = { "Courier New-10", |
| 4151 | "-*-Courier-normal-r-*-*-13-*-*-*-c-*-iso8859-1", | 4151 | "-*-Courier-normal-r-*-*-13-*-*-*-c-*-iso8859-1", |
| 4152 | "-*-Fixedsys-normal-r-*-*-12-*-*-*-c-*-iso8859-1", | 4152 | "-*-Fixedsys-normal-r-*-*-12-*-*-*-c-*-iso8859-1", |
| 4153 | "Fixedsys", | 4153 | "Fixedsys", |
| @@ -4297,6 +4297,9 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 4297 | specbind (Qx_resource_name, name); | 4297 | specbind (Qx_resource_name, name); |
| 4298 | } | 4298 | } |
| 4299 | 4299 | ||
| 4300 | f->resx = dpyinfo->resx; | ||
| 4301 | f->resy = dpyinfo->resy; | ||
| 4302 | |||
| 4300 | #ifdef USE_FONT_BACKEND | 4303 | #ifdef USE_FONT_BACKEND |
| 4301 | if (enable_font_backend) | 4304 | if (enable_font_backend) |
| 4302 | { | 4305 | { |
| @@ -7395,6 +7398,9 @@ x_create_tip_frame (dpyinfo, parms, text) | |||
| 7395 | specbind (Qx_resource_name, name); | 7398 | specbind (Qx_resource_name, name); |
| 7396 | } | 7399 | } |
| 7397 | 7400 | ||
| 7401 | f->resx = dpyinfo->resx; | ||
| 7402 | f->resy = dpyinfo->resy; | ||
| 7403 | |||
| 7398 | #ifdef USE_FONT_BACKEND | 7404 | #ifdef USE_FONT_BACKEND |
| 7399 | if (enable_font_backend) | 7405 | if (enable_font_backend) |
| 7400 | { | 7406 | { |