# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 970485541 0
# Node ID 843a778fa14a2fa87d5e1549b7cf7f3eb7eb717a
# Parent  ca921c729a0745dab116978e87a2c00fa01ffa27
*** empty log message ***

diff -r ca921c729a07 -r 843a778fa14a lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 02 11:18:21 2000 +0000
+++ b/lisp/ChangeLog	Mon Oct 02 11:19:01 2000 +0000
@@ -1,3 +1,8 @@
+2000-10-02  Gerd Moellmann  <gerd@gnu.org>
+
+	* startup.el (fancy-splash-head): Change message below the
+	logo.
+
 2000-10-02  Miles Bader  <miles@lsi.nec.co.jp>
 
 	* diff-mode.el (diff-goto-source): Emit a status message.
diff -r ca921c729a07 -r 843a778fa14a src/ChangeLog
--- a/src/ChangeLog	Mon Oct 02 11:18:21 2000 +0000
+++ b/src/ChangeLog	Mon Oct 02 11:19:01 2000 +0000
@@ -1,3 +1,14 @@
+2000-10-02  Gerd Moellmann  <gerd@gnu.org>
+
+	* lisp.h (wrong_type_argument): Remove NO_RETURN, the function can
+	return with a string converted to an integer or vice versa when
+	Vmocklisp_arguments is t.
+	(Fsignal): Likewise.  The function can return for `quit'.
+	(struct gcpro): Declare member `var' to point to a volatile
+	Lisp_Object.
+
+	* eval.c (error): Prevent compiler warning.
+
 2000-09-30  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* keymap.c (keymap_memberp): New function.
@@ -9,8 +20,8 @@
 2000-09-30  Gerd Moellmann  <gerd@gnu.org>
 
 	* process.c (Fopen_network_stream) [HAVE_GETADDRINFO]: Use
-	 gai_strerror.  Make sure xerrno is set if connect fails.  Improve
-	 error recovery.
+	gai_strerror.  Make sure xerrno is set if connect fails.  Improve
+	error recovery.
 
 2000-09-29  Jason Rumney <jasonr@gnu.org>