*** empty log message ***

2 files changed, 22 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index ba18c42b9aa..71b784487fb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -261,6 +261,18 @@ There is now support for Imenu to index headings.  A new command
 `outline-headers-as-kill' copies the visible headings in the region to
 the kill ring, e.g. to produce a table of contents.
 
+** Changes to Emacs Server 
+
+*** There new option `server-kill-new-buffers' specifies what to do
+with buffers when done with them.  If non-nil, the default, buffers
+are killed, unless they were already present before visiting them with
+Emacs Server.  If nil, `server-temp-file-regexp' specifies which
+buffers to kill, as before.
+
+Please note that only buffers are killed that still have a client,
+i.e. buffers visited which `emacsclient --no-wait' are never killed in
+this way.
+
 ** Changes to Show Paren mode.
 
 *** Overlays used by Show Paren mode now use a priority property.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bacc1cbf0c..d081e6ccfda 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-08-21  Gerd Moellmann  <gerd@gnu.org>
+
+        * server.el (server-kill-new-buffers): New user option.
+        (server-existing-buffer): New buffer-local variable.
+        (server-visit-files): When using an existing buffer, set
+        server-existing-buffer to t.
+        (server-buffer-done): If server-kill-new-buffers is t, kill the
+        buffer, unless it was already present before visiting it with
+        Emacs server.
+        
 2000-08-21  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * man.el (Man-init-defvars): Don't reset Man-fontify-manpage-flag,