*** empty log message ***

etc/ChangeLog

+2000-08-17  Gerd Moellmann  <gerd@gnu.org>
+
+	* NEWS.1: Reintegrated into NEWS.
+
+	* OOOOONEWS...OONEWS: Renamed to NEWS.1...NEWS.4.
+
 2000-08-16  Gerd Moellmann  <gerd@gnu.org>
 
 	* dired-ref.tex, dired-ref.ps: New files.

etc/OOOONEWS → etc/NEWS.2

@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
 Copyright (C) 1986 Richard M. Stallman.
 See the end for copying conditions.
 
-For older news, see the file OOOOONEWS.
+For older news, see the file NEWS.1.
 
 Changes in Emacs 17
 
@@ -1326,7 +1326,7 @@ except when `-batch' has been specified.
 
 This is because -batch (see above) is now used in building Emacs.
 
-For older news, see the file OOOONEWS.
+For older news, see the file NEWS.1.
 
 ----------------------------------------------------------------------
 Copyright information:

etc/OOONEWS → etc/NEWS.3

@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
 Copyright (C) 1988 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-For older news, see the file OOOONEWS.
+For older news, see the file NEWS.2.
 
 Changes in version 18.52.
 
@@ -1587,7 +1587,7 @@ C_DEBUG_SWITCH defines the switches to give `cc' when debugging.  Default `-g'.
 C_OPTIMIZE_SWITCH defines the switches to give `cc' to optimize.  Default `-O'.
 C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches.
 
-For older news, see the file OOONEWS.
+For older news, see the file NEWS.2.
 
 ----------------------------------------------------------------------
 Copyright information:

etc/OONEWS → etc/NEWS.4

@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  1992.
 Copyright (C) 1992 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-For older news, see the file OOONEWS.
+For older news, see the file NEWS.3.
 
 Changes in version 18.58.
 
@@ -1669,7 +1669,7 @@ C_DEBUG_SWITCH defines the switches to give `cc' when debugging.  Default `-g'.
 C_OPTIMIZE_SWITCH defines the switches to give `cc' to optimize.  Default `-O'.
 C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches.
 
-For older news, see the file OONEWS.
+For older news, see the file NEWS.3.
 
 ----------------------------------------------------------------------
 Copyright information:

etc/ONEWS

@@ -2,7 +2,7 @@ GNU Emacs NEWS -- history of user-visible changes.  1992.
 Copyright (C) 1995 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-For older news, see the file OONEWS.
+For older news, see the file NEWS.4.
 
 * Editing Changes in Emacs 19.30.
 
@@ -254,7 +254,7 @@ your working file with the latest version from the master.
 *** RCS customization.
 
 There is a new variable vc-consult-headers.  If it is t (the default),
-VC searches for RCS headers in working files (like `$Id$') and
+VC searches for RCS headers in working files (like `$Id: ONEWS,v 1.1 1999/10/03 11:59:45 fx Exp $') and
 determines the state of the file from them, not from the master file.
 This is fast and more reliable when you use branches.  (The variable
 was already present in Emacs 19.29, but didn't get mentioned in the
@@ -5685,7 +5685,7 @@ old file versions, executables, DOC files, and other
 architecture-specific or easy-to-recreate files are not included in
 the tar file.
 
-* For older news, see the file OONEWS.  For Lisp changes in (the first
+* For older news, see the file NEWS.4.  For Lisp changes in (the first
 * release of) Emacs 19, see the file LNEWS.
 
 ----------------------------------------------------------------------

lisp/ChangeLog

+2000-08-17  Gerd Moellmann  <gerd@gnu.org>
+
+	* help.el (view-emacs-news): Rewritten for new naming scheme
+	for old NEWS files.
+
+	* startup.el (command-line): Pop to *Messages* in case an error
+	is signaled while loading user-init-file.
+
 2000-08-17  Andreas Schwab  <schwab@suse.de>
 
 	* files.el (insert-directory): Don't lose original file name,