*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index addc2f25314dd8b59b6d78d2bbe7974adaba9baa..7c34473d5a09fbe9907666ba073512512007aa4a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 1b68592eced99cba1661e17196abd4591d49adcf..c890250eb4934d70690c66610a1f17915bf3d922 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>