emacsclient, --alternate-editor

2 files changed, 12 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 10bf603a41..bd66d8492f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -5390,10 +5390,17 @@ variables as buffer-local variables.
 *** DSSSL mode is a variant of Scheme mode, for editing DSSSL scripts.
 Use M-x dsssl-mode.
 
-** The emacsclient program now accepts an option --no-wait which tells
+** Changes to the emacsclient program
+
+*** The emacsclient program now accepts an option --no-wait which tells
 it to return immediately without waiting for you to "finish" the
 buffer in Emacs.
 
+*** The new option --alternate-editor allows to specify an editor to
+use if Emacs is not running.  The environment variable
+ALTERNATE_EDITOR can be used for the same effect; the command line
+option takes precedence.
+
 ** M-x eldoc-mode enables a minor mode in which the echo area
 constantly shows the parameter list for function being called at point
 (in Emacs Lisp and Lisp Interaction modes only).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d9fc769305..06de896681 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2000-01-12  Gerd Moellmann  <[email protected]>
 
+	* net: New directory.
+
 	* emacs-lisp/lisp-mode.el (eval-last-sexp-1): Renamed from
 	eval-last-sexp.  Don't bind debug-on-error here.
 	(eval-last-sexp): New function.  Bind debug-on-error if
@@ -29,8 +31,8 @@
 	of erasing buffer.
 
 	* textmodes/fill.el (fill-common-string-prefix): New function.
-	(fill-context-prefix): Use the longest common substring of both
-	prefixes, if there is one.
+	(fill-context-prefix): Use the longest common prefix of first
+	and second line fill prefix, if there is one.
 
 2000-01-11  Richard M. Stallman  <[email protected]>