# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 947686589 0
# Node ID 1fb75ba2452d5d67dad6dc89f1f1a9e1eb63b08c
# Parent  a7bf11fbec64fa96f51c722a8498d286dcb0bd37
*** empty log message ***

diff -r a7bf11fbec64 -r 1fb75ba2452d lib-src/ChangeLog
--- a/lib-src/ChangeLog	Wed Jan 12 14:15:38 2000 +0000
+++ b/lib-src/ChangeLog	Wed Jan 12 14:16:29 2000 +0000
@@ -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 -r a7bf11fbec64 -r 1fb75ba2452d lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 12 14:15:38 2000 +0000
+++ b/lisp/ChangeLog	Wed Jan 12 14:16:29 2000 +0000
@@ -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