From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 10 Jul 2001 12:57:08 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.104~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b05fae3af94b547924952a87d5ae03bd794f567;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92428a71086..029acf33895 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-10  Gerd Moellmann  <gerd@gnu.org>
+
+	* startup.el (normal-top-level): Don't operate on the initial
+	frame if we failed to create one.
+
 2001-07-10  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* term/tty-colors.el: Fix the header line and copyright years.
diff --git a/src/ChangeLog b/src/ChangeLog
index 0e66830d018..baf6f5404e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2001-07-10  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfaces.c (unload_color): Do nothing if PIXEL is -1.
+
+	* xfns.c (Fx_create_frame): Initialize frame colors to -1,
+	for the case that x_decode_colors signals an error.
+
 	* xdisp.c (add_to_log): Do nothing if called asynchronously.
 
 2001-07-09  Gerd Moellmann  <gerd@gnu.org>