[Emacs-diffs] Changes to emacs/src/w32fns.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/04/03 13:11:30

Index: w32fns.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32fns.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -b -r1.320 -r1.321
--- w32fns.c    27 Mar 2008 17:10:14 -0000      1.320
+++ w32fns.c    3 Apr 2008 13:11:29 -0000       1.321
@@ -341,6 +341,12 @@
 extern HMENU current_popup_menu;
 static int menubar_in_use = 0;
 
+/* From w32uniscribe.c  */
+#ifdef USE_FONT_BACKEND
+extern void syms_of_w32uniscribe ();
+extern int uniscribe_available;
+#endif
+
 /* Function prototypes for hourglass support.  */
 static void show_hourglass P_ ((struct frame *));
 static void hide_hourglass P_ ((void));
@@ -4443,6 +4449,8 @@
     {
       /* 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,
@@ -9357,6 +9365,10 @@
 
   /* MessageBox does not work without this when linked to comctl32.dll 6.0.  */
   InitCommonControls ();
+
+#ifdef USE_FONT_BACKEND
+  syms_of_w32uniscribe ();
+#endif
 }
 
 #undef abort