# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 966851812 0
# Node ID 92be2cf59eca6dfde18617100ec807ec026c3aa9
# Parent  c5430a16cb23c1a26ba86ac2655e410773e0c930
*** empty log message ***

diff -r c5430a16cb23 -r 92be2cf59eca info/.cvsignore
--- a/info/.cvsignore	Mon Aug 21 09:56:32 2000 +0000
+++ b/info/.cvsignore	Mon Aug 21 09:56:52 2000 +0000
@@ -32,6 +32,7 @@
 emacs-31
 emacs-32
 emacs-33
+emacs-34
 ccmode
 ccmode-1
 ccmode-2
@@ -108,3 +109,4 @@
 idlwave-2
 ebrowse
 pcl-cvs
+woman
diff -r c5430a16cb23 -r 92be2cf59eca lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Aug 21 09:56:32 2000 +0000
+++ b/lisp/ChangeLog	Mon Aug 21 09:56:52 2000 +0000
@@ -1,3 +1,8 @@
+2000-08-21  Gerd Moellmann  <gerd@gnu.org>
+
+	* startup.el (command-line): If user's init file had an error,
+	add explanatory text to *Messages*.
+
 2000-08-21  Kenichi Handa  <handa@etl.go.jp>
 
 	* man.el (Man-getpage-in-background): Decode the process output by