From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 21 Aug 2000 09:56:52 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~2139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cbcef616a3be2414c6f82beee1249e2ae60eaee9;p=emacs.git

*** empty log message ***
---

diff --git a/info/.gitignore b/info/.gitignore
index 97be716fdb4..a9253c58045 100644
--- a/info/.gitignore
+++ b/info/.gitignore
@@ -32,6 +32,7 @@ emacs-30
 emacs-31
 emacs-32
 emacs-33
+emacs-34
 ccmode
 ccmode-1
 ccmode-2
@@ -108,3 +109,4 @@ idlwave-1
 idlwave-2
 ebrowse
 pcl-cvs
+woman
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c39958a213..39ff38891ff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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