aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32fns.c11
2 files changed, 4 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9d496f46c32..1f429c49dc7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-03-14 Eli Zaretskii <eliz@gnu.org>
2
3 * w32fns.c (globals_of_w32fns, Fx_create_frame): Fix last change.
4
12008-03-14 Jason Rumney <jasonr@gnu.org> 52008-03-14 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32fns.c (MONITOR_DEFAULT_TO_NEAREST, struct MONITOR_INFO) 7 * w32fns.c (MONITOR_DEFAULT_TO_NEAREST, struct MONITOR_INFO)
diff --git a/src/w32fns.c b/src/w32fns.c
index 348cda7a24e..d88e86d54f6 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -335,12 +335,6 @@ static HWND w32_visible_system_caret_hwnd;
335extern HMENU current_popup_menu; 335extern HMENU current_popup_menu;
336static int menubar_in_use = 0; 336static int menubar_in_use = 0;
337 337
338/* From w32uniscribe.h */
339#ifdef USE_FONT_BACKEND
340extern void syms_of_w32uniscribe ();
341extern int uniscribe_available;
342#endif
343
344 338
345/* Error if we are not connected to MS-Windows. */ 339/* Error if we are not connected to MS-Windows. */
346void 340void
@@ -4417,8 +4411,6 @@ This function is an internal primitive--use `make-frame' instead. */)
4417 { 4411 {
4418 /* Perhaps, we must allow frame parameter, say `font-backend', 4412 /* Perhaps, we must allow frame parameter, say `font-backend',
4419 to specify which font backends to use. */ 4413 to specify which font backends to use. */
4420 if (uniscribe_available)
4421 register_font_driver (&uniscribe_font_driver, f);
4422 register_font_driver (&w32font_driver, f); 4414 register_font_driver (&w32font_driver, f);
4423 4415
4424 x_default_parameter (f, parameters, Qfont_backend, Qnil, 4416 x_default_parameter (f, parameters, Qfont_backend, Qnil,
@@ -9388,9 +9380,6 @@ globals_of_w32fns ()
9388 9380
9389 /* MessageBox does not work without this when linked to comctl32.dll 6.0. */ 9381 /* MessageBox does not work without this when linked to comctl32.dll 6.0. */
9390 InitCommonControls (); 9382 InitCommonControls ();
9391#ifdef USE_FONT_BACKEND
9392 syms_of_w32uniscribe ();
9393#endif
9394} 9383}
9395 9384
9396#undef abort 9385#undef abort