From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 12 Jan 2000 14:16:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.90~5364
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4936aa97cb07ec0a043ce30cc7e2c3954b4a28a;p=emacs.git

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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d81a0f60b8f..5cb146bfb65 100644
--- 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 06de8966811..543eb3e5960 100644
--- 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