# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1079030807 0
# Node ID b21573dfef23f35292e797defd13ed603bd3f8ca
# Parent  367f0279478f16b4c1065d0b7066196148406b5f
*** empty log message ***

diff -r 367f0279478f -r b21573dfef23 etc/NEWS
--- a/etc/NEWS	Thu Mar 11 18:35:20 2004 +0000
+++ b/etc/NEWS	Thu Mar 11 18:46:47 2004 +0000
@@ -97,6 +97,13 @@
 and `save-place-skip-check-regexp' allow further fine-tuning of this
 feature.
 
+** You can have several Emacs servers on the same machine.
+
+	% emacs --eval '(setq server-name "foo")' -f server-start &
+	% emacs --eval '(setq server-name "bar")' -f server-start &
+	% emacsclient -s foo file1
+	% emacsclient -s bar file2
+
 ** On window systems, lines which are exactly as wide as the window
 (not counting the final newline character) are no longer broken into
 two lines on the display (with just the newline on the second line).
diff -r 367f0279478f -r b21573dfef23 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Mar 11 18:35:20 2004 +0000
+++ b/lisp/ChangeLog	Thu Mar 11 18:46:47 2004 +0000
@@ -1,12 +1,25 @@
+2004-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* server.el (server-name): New var.
+	(server-socket-dir): New var to replace server-socket-name.
+	(server-start): Use them.
+
 2004-03-11  Simon Josefsson  <jas@extundo.com>
 
 	* mail/smtpmail.el (smtpmail-read-response): Abort if process has
 	died to avoid infloop.  Reported by Jonathan Glauner
 	<jglauner@sbum.org>.
 
+2004-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* smerge-mode.el (smerge-check-cache, smerge-check): New var and fun.
+	(smerge-mode-menu): Use it to deactivate menu entries.
+	(smerge-keep-current): New fun.
+	(smerge-keep-current): Use it.
+
 2004-03-10  John Paul Wallington  <jpw@gnu.org>
 
-	* foldout.el (foldout-fold-list, foldout-modeline-string): 
+	* foldout.el (foldout-fold-list, foldout-modeline-string):
 	Declare them as variables, not constants.
 
 2004-03-10  Vinicius Jose Latorre  <viniciusjl@ig.com.br>