From: Kim F. Storm <storm@cua.dk>
Date: Wed, 29 Sep 2004 08:51:40 +0000 (+0000)
Subject: * fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
X-Git-Tag: ttn-vms-21-2-B4~4772
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f2be4fd018aa735f751d8e89c0f2a228e49ed2dc;p=emacs.git

* fringe.c (destroy_fringe_bitmap, init_fringe_bitmap)
(w32_init_fringe, w32_reset_fringes): Fix bootstrap (NULL rif).
---

diff --git a/src/fringe.c b/src/fringe.c
index a7d6dade538..915652d6ba9 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1079,7 +1079,7 @@ destroy_fringe_bitmap (n)
   fbp = &fringe_bitmaps[n];
   if (*fbp && (*fbp)->dynamic)
     {
-      if (rif->destroy_fringe_bitmap)
+      if (rif && rif->destroy_fringe_bitmap)
 	rif->destroy_fringe_bitmap (n);
       xfree (*fbp);
       *fbp = NULL;
@@ -1185,7 +1185,7 @@ init_fringe_bitmap (which, fb, once_p)
     {
       destroy_fringe_bitmap (which);
 
-      if (rif->define_fringe_bitmap)
+      if (rif && rif->define_fringe_bitmap)
 	rif->define_fringe_bitmap (which, fb->bits, fb->height, fb->width);
 
       fringe_bitmaps[which] = fb;
@@ -1445,6 +1445,9 @@ w32_init_fringe ()
 {
   enum fringe_bitmap_type bt;
 
+  if (!rif)
+    return;
+
   for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++)
     {
       struct fringe_bitmap *fb = &standard_bitmaps[bt];
@@ -1458,6 +1461,9 @@ w32_reset_fringes ()
   /* Destroy row bitmaps.  */
   int bt;
 
+  if (!rif)
+    return;
+
   for (bt = NO_FRINGE_BITMAP + 1; bt < max_used_fringe_bitmap; bt++)
     rif->destroy_fringe_bitmap (bt);
 }