summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--info/.gitignore2
-rw-r--r--lisp/ChangeLog5
2 files changed, 7 insertions, 0 deletions
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