summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Innes <andrewi@gnu.org>2001-02-06 22:20:12 +0000
committerAndrew Innes <andrewi@gnu.org>2001-02-06 22:20:12 +0000
commita8370d728ce5d19b208d183bb664d7e11c9d6481 (patch)
tree26a56e1b0bd8dfdc2c2840eafe4b49457ea088b6 /src
parent98c4a0745f827100db7361d544c9cd62a4769665 (diff)
downloademacs-a8370d728ce5d19b208d183bb664d7e11c9d6481.tar.gz
emacs-a8370d728ce5d19b208d183bb664d7e11c9d6481.tar.bz2
emacs-a8370d728ce5d19b208d183bb664d7e11c9d6481.zip
(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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32xfns.c2
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 =