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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/22 17:42:10

Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -b -r1.377 -r1.378
--- xfaces.c    17 Feb 2008 02:01:26 -0000      1.377
+++ xfaces.c    22 Feb 2008 17:42:05 -0000      1.378
@@ -894,9 +894,10 @@
   /* Make the image cache.  */
   if (FRAME_WINDOW_P (f))
     {
-      if (FRAME_X_IMAGE_CACHE (f) == NULL)
-       FRAME_X_IMAGE_CACHE (f) = make_image_cache ();
-      ++FRAME_X_IMAGE_CACHE (f)->refcount;
+      if (FRAME_IMAGE_CACHE (f) == NULL)
+       /* Is that ever possible??  --Stef  */
+       FRAME_IMAGE_CACHE (f) = make_image_cache ();
+      ++FRAME_IMAGE_CACHE (f)->refcount;
     }
 #endif /* HAVE_WINDOW_SYSTEM */
 
@@ -933,7 +934,7 @@
 #ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
     {
-      struct image_cache *image_cache = FRAME_X_IMAGE_CACHE (f);
+      struct image_cache *image_cache = FRAME_IMAGE_CACHE (f);
       if (image_cache)
        {
          --image_cache->refcount;
@@ -1008,11 +1009,9 @@
        {
          f = XFRAME (frame);
          if (FRAME_WINDOW_P (f))
-           {
              clear_face_gcs (FRAME_FACE_CACHE (f));
-             clear_image_cache (f, 0);
-           }
        }
+      clear_image_caches (0);
     }
 #endif /* HAVE_WINDOW_SYSTEM */
 }