(font_update_drivers): Sanity fallback to avoid disabling all drivers.

2 files changed, 20 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b3f5bb483fa..5f41bd894f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * font.c (font_update_drivers): Sanity fallback to avoid disabling
+        all drivers.
+
         * nsterm.m (-windowDidResize:): Avoid inf-loop under GNUStep.
 
 2009-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
diff --git a/src/font.c b/src/font.c
index 16ae9cdc0f4..cdff0d678e6 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3655,6 +3655,23 @@ font_update_drivers (f, new_drivers)
           next = &(*next)->next;
         }
       *next = NULL;
+
+      if (! f->font_driver_list->on)
+        { /* None of the drivers is enabled: enable them all.
+             Happens if you set the list of drivers to (xft x) in your .emacs
+             and then use it under w32 or ns.  */
+          for (list = f->font_driver_list; list; list = list->next)
+            {
+              struct font_driver *driver = list->driver;
+              eassert (! list->on);
+              if (! driver->start_for_frame
+                  || driver->start_for_frame (f) == 0)
+                {
+                  font_prepare_cache (f, driver);
+                  list->on = 1;
+                }
+            }
+        }
     }
 
   for (list = f->font_driver_list; list; list = list->next)