*** empty log message ***

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d81a0f60b8fbf2f4986d8e6b4d481e9cbc1b0d76..5cb146bfb65b5f29eee6d1ee203cee63d27a97ea 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-12  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * emacsclient.c: Add option -a EDITOR and environment variable
+       ALTERNATE_EDITOR.  Exec this editor if we fail to contact Emacs.
+
 1999-12-10  Jonathan Kamens <jik@kamens.brookline.ma.us>
 
        * movemail.c (popmail): Allow mailbox specifications of the

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06de896681102c58404e05d9c93df4760c54fa64..543eb3e5960ec4d224e5e6b24854e6957a4a3a6f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2000-01-12  Gerd Moellmann  <gerd@gnu.org>
 
+       * add-log.el (add-change-log-entry): Fix error trying an `(insert
+       nil)'.
+
+       * subdirs.el: Add `net' directory.
+
        * net: New directory.
 
        * emacs-lisp/lisp-mode.el (eval-last-sexp-1): Renamed from