(globals_of_w32fns, Fx_create_frame): Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d496f46c3255e276237aa71da57552b8d28fec5..1f429c49dc7ec89fcbef00bffda01a16b8575bc9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)

diff --git a/src/w32fns.c b/src/w32fns.c
index 348cda7a24e446f50eb1437643626ffb62bbaaa3..d88e86d54f677bdfa72d722bff75147b9f5ad1e2 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -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
-
 \f
 /* 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