3 files changed, 27 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5abac5d116b..98a2422f252 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-23  Gerd Moellmann  <gerd@gnu.org>
 
+        * startup.el (command-line): Determine source file of compiled
+        user init file differently.  Warn if compiled user init file
+        is older than its source file.
+
         * ffap.el (ffap-url-regexp): Add `https'.
         
 2000-05-23  Eli Zaretskii  <eliz@is.elta.co.il>
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index c3fcec67213..df6e33f2396 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -37,10 +37,10 @@ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
-Invariant Sections being Copying and GNU Free Documentation License, the
-Front-Cover texts being ``A GNU Manual'', and with the Back-Cover Texts
-being (a) (see below).  A copy of the license is included in the section
-entitled ``GNU Free Documentation License''.
+Invariant Sections being ``Copying'', with the Front-Cover texts being
+``A GNU Manual'', and with the Back-Cover Texts as in (a) below.  A copy
+of the license is included in the section entitled ``GNU Free
+Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
@@ -52,7 +52,7 @@ Software Foundation raise funds for GNU development.''
 @subtitle For Emacs Version 21
 @c The edition number appears in several places in this file
 @c and also in the file intro.texi.
-@subtitle Revision 2.6, September 1999
+@subtitle Revision 2.6, May 2000
 
 @author by Bil Lewis, Dan LaLiberte, Richard Stallman
 @author and the GNU Manual Group
@@ -64,7 +64,7 @@ Free Software Foundation, Inc.
 @sp 2
 Edition 2.6 @*
 Revised for Emacs Version 21.1,@*
-September 1999.@*
+May 2000.@*
 @sp 2
 ISBN 1-882114-73-6
 
@@ -76,10 +76,10 @@ Boston, MA  02111-1307  USA
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.1 or
 any later version published by the Free Software Foundation; with the
-Invariant Sections being Copying and GNU Free Documentation License, the
-Front-Cover texts being ``A GNU Manual'', and with the Back-Cover Texts
-being (a) (see below).  A copy of the license is included in the section
-entitled ``GNU Free Documentation License''.
+Invariant Sections being ``Copying'', with the Front-Cover texts being
+``A GNU Manual'', and with the Back-Cover Texts as in (a) below.  A copy
+of the license is included in the section entitled ``GNU Free
+Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
 this GNU Manual, like GNU software.  Copies published by the Free
diff --git a/src/ChangeLog b/src/ChangeLog
index fceb7ab65ae..54f960092fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2000-05-23  Gerd Moellmann  <gerd@gnu.org>
+
+        * lread.c (Fload): Add a comment about the meaning of
+        Vuser_init_file being t.
+
+        * puresize.h (BASE_PURESIZE): Increase to 675000.
+
+        * s/gnu-linux.h (setpgrp): Don't define it here because this
+        prevents compilation on GNU/Linux systems with glib 2.2.
+
+        * callproc.c, emacs.c, sysdep.c (setpgrp) [HAVE_SETPGID]: Define
+        as setpgid.
+        
 2000-05-23  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * Makefile.in (SOME_MACHINE_LISP): Add disp-table.elc,