*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 5643bc90b35181c694aaa102b1bf2e25d1628dd5..17d30910f9cefdf27dbd59756e6e36f86303db51 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -97,6 +97,13 @@ to get the old behavior.  The new options `save-place-save-skipped'
 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4fbf3c5aea5a458cda1f8bf68716700e9bc55f9a..86b8eb8bb69c9f52651b41fcb72c54c803316b8b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>