[Emacs-diffs] emacs/src ChangeLog font.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/05/06 02:57:48

Modified files:
        src            : ChangeLog font.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7533&r2=1.7534
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.128&r2=1.129

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7533
retrieving revision 1.7534
diff -u -b -r1.7533 -r1.7534
--- ChangeLog   6 May 2009 02:49:35 -0000       1.7533
+++ ChangeLog   6 May 2009 02:57:47 -0000       1.7534
@@ -1,5 +1,8 @@
 2009-05-06  Stefan Monnier  <address@hidden>
 
+       * 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  <address@hidden>

Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- font.c      30 Apr 2009 05:02:02 -0000      1.128
+++ font.c      6 May 2009 02:57:48 -0000       1.129
@@ -3655,6 +3655,23 @@
          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)