Mercurial > hg > xemacs-beta
diff src/objects-msw.c @ 5009:2eec7322eb7f
Miscellaneous small fixes to Windows VS6 build
author | Vin Shelton <acs@xemacs.org> |
---|---|
date | Tue, 09 Feb 2010 16:25:04 -0500 |
parents | 3c3c1d139863 |
children | 7e57c0575a15 |
line wrap: on
line diff
--- a/src/objects-msw.c Mon Feb 08 20:45:21 2010 -0500 +++ b/src/objects-msw.c Tue Feb 09 16:25:04 2010 -0500 @@ -2081,28 +2081,30 @@ assert(0); } - HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil, - font_list, - ERROR_ME_DEBUG_WARN, - &truename); + { + HFONT hfont = create_hfont_from_font_spec (the_nonreloc, hdc, Qnil, + font_list, + ERROR_ME_DEBUG_WARN, + &truename); - if (!hfont || !(hfont = (HFONT) SelectObject (hdc, hfont))) - { - nope: - DeleteDC (hdc); - UNGCPRO; - return 0; - } - - if (GetTextCharsetInfo (hdc, &fs, 0) == DEFAULT_CHARSET) - { - SelectObject (hdc, hfont); - goto nope; - } - SelectObject (hdc, hfont); - DeleteDC (hdc); - Fputhash (reloc, make_opaque (&fs, sizeof (fs)), Vfont_signature_data); - UNGCPRO; + if (!hfont || !(hfont = (HFONT) SelectObject (hdc, hfont))) + { + nope: + DeleteDC (hdc); + UNGCPRO; + return 0; + } + + if (GetTextCharsetInfo (hdc, &fs, 0) == DEFAULT_CHARSET) + { + SelectObject (hdc, hfont); + goto nope; + } + SelectObject (hdc, hfont); + DeleteDC (hdc); + Fputhash (reloc, make_opaque (&fs, sizeof (fs)), Vfont_signature_data); + UNGCPRO; + } } {