2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f0b7c6ef2b5..09104cd0389 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-06  Andrew Innes  <andrewi@gnu.org>
+
+        * w32xfns.c (select_palette): Do nothing if palette hasn't yet
+        been created.  It seems we can get sent window messages such as
+        WM_ERASEBKGND before we properly update a frame.
+
 2001-02-06  Gerd Moellmann  <gerd@gnu.org>
 
         * dispnew.c (update_frame_line): Rename parameter FRAME to F.
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 49d3e1c2e7e..689a2829eb3 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -90,7 +90,7 @@ select_palette (FRAME_PTR f, HDC hdc)
     return;
 
   if (display_info->palette == 0)
-    abort ();
+    return;
 
   if (!NILP (Vw32_enable_palette))
     f->output_data.w32->old_palette =