(server-buffer-done): Bury the buffer before

killing it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e31727d3f8134b78b7723534818f996807b86fe4..1596b093cca56b8dd990c5960d917bf5e03c757c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-18  Gerd Moellmann  <gerd@gnu.org>
 
+       * server.el (server-buffer-done): Bury the buffer before
+       killing it.
+
        * faces.el (face-spec-set): Interpret a nil in specs for
        foreground and background colors as `unspecified', for
        compatibility with 20.x.

diff --git a/lisp/server.el b/lisp/server.el
index e362c8e5607c70f53c590e984227f24fb6c2210f..e4a451c364a9e661544ebe41e260dfe745a3b4ab 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -390,6 +390,7 @@ or nil.  KILLED is t if we killed BUFFER
                           (set-buffer buffer)
                           server-existing-buffer))
                (setq killed t)
+               (bury-buffer buffer)
                (kill-buffer buffer))
              (unless killed
                (if (server-temp-file-p buffer)