Mercurial > emacs
changeset 32791:43fa65d08292
(x_to_w32_font): Initialize dpi from dpyinfo->resy.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Mon, 23 Oct 2000 22:11:51 +0000 |
| parents | 131348208699 |
| children | f2ad0856e45c |
| files | src/w32fns.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32fns.c Mon Oct 23 22:10:00 2000 +0000 +++ b/src/w32fns.c Mon Oct 23 22:11:51 2000 +0000 @@ -5172,7 +5172,7 @@ } /* Try out a font which we hope has bold and italic variations. */ if (!STRINGP (font)) - font = x_new_font (f, "-*-Courier New-normal-r-*-*-13-*-*-*-c-*-iso8859-1"); + font = x_new_font (f, "-*-Courier New-normal-r-*-*-*-120-*-*-c-*-iso8859-1"); if (! STRINGP (font)) font = x_new_font (f, "-*-Courier-normal-r-*-*-13-*-*-*-c-*-iso8859-1"); /* If those didn't work, look for something which will at least work. */ @@ -5798,7 +5798,7 @@ /* Extract charset part of font string. */ if (sscanf (fontname, "-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%*[^-]-%19s", - charset_str) == EOF) + charset_str) < 1) return CP_DEFAULT; /* Remove leading "*-". */ @@ -5952,7 +5952,7 @@ char name[50], weight[20], slant, pitch, pixels[10], height[10], width[10], resy[10], remainder[20]; char * encoding; - int dpi = one_w32_display_info.height_in; + int dpi = one_w32_display_info.resy; fields = sscanf (lpxstr, "-%*[^-]-%49[^-]-%19[^-]-%c-%*[^-]-%*[^-]-%9[^-]-%9[^-]-%*[^-]-%9[^-]-%c-%9[^-]-%19s",