*** empty log message ***

diff --git a/info/.gitignore b/info/.gitignore
index 97be716fdb413dc9057a396fc3c4d6fe3c7e4b76..a9253c58045f070d583180e4b2c2cc88d683ee56 100644 (file)
--- 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 8c39958a213d293eafd2a9bd1e62279951f3ad0b..39ff38891ff7975bcdfc912081c178b2149c2771 100644 (file)
--- 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