mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 00:01:33 -08:00
Code Issues Projects Releases Wiki Activity

(globals_of_w32fns, Fx_create_frame): Fix last change.

Browse source
This commit is contained in:
Eli Zaretskii 2008-03-14 16:22:38 +00:00
parent ef49d20fe8
commit f507f365a7
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2008-03-14 Eli Zaretskii <eliz@gnu.org>
* w32fns.c (globals_of_w32fns, Fx_create_frame): Fix last change.
2008-03-14 Jason Rumney <jasonr@gnu.org>
* w32fns.c (MONITOR_DEFAULT_TO_NEAREST, struct MONITOR_INFO)

11
src/w32fns.c
View file

@ -335,12 +335,6 @@ static HWND w32_visible_system_caret_hwnd;
extern HMENU current_popup_menu;
static int menubar_in_use = 0;
/* From w32uniscribe.h */
#ifdef USE_FONT_BACKEND
extern void syms_of_w32uniscribe ();
extern int uniscribe_available;
#endif
/* Error if we are not connected to MS-Windows. */
void
@ -4417,8 +4411,6 @@ This function is an internal primitive--use `make-frame' instead. */)
{
/* Perhaps, we must allow frame parameter, say `font-backend',
to specify which font backends to use. */
if (uniscribe_available)
register_font_driver (&uniscribe_font_driver, f);
register_font_driver (&w32font_driver, f);
x_default_parameter (f, parameters, Qfont_backend, Qnil,
@ -9388,9 +9380,6 @@ globals_of_w32fns ()
/* MessageBox does not work without this when linked to comctl32.dll 6.0. */
InitCommonControls ();
#ifdef USE_FONT_BACKEND
syms_of_w32uniscribe ();
#endif
}
#undef abort