aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-12-18 17:01:16 +0000
committerGerd Moellmann2000-12-18 17:01:16 +0000
commit3d2a0e0b7bf9b544681947537ca2cae76598dd74 (patch)
treece7d0deb4d071ac768c95d3d53db430e7ae1577c
parent91c9e6ce1d68eaed9368a1de6c0a70b193d51a90 (diff)
downloademacs-3d2a0e0b7bf9b544681947537ca2cae76598dd74.tar.gz
emacs-3d2a0e0b7bf9b544681947537ca2cae76598dd74.zip
(server-buffer-done): Bury the buffer before
killing it.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/server.el1
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e31727d3f81..1596b093cca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12000-12-18 Gerd Moellmann <gerd@gnu.org> 12000-12-18 Gerd Moellmann <gerd@gnu.org>
2 2
3 * server.el (server-buffer-done): Bury the buffer before
4 killing it.
5
3 * faces.el (face-spec-set): Interpret a nil in specs for 6 * faces.el (face-spec-set): Interpret a nil in specs for
4 foreground and background colors as `unspecified', for 7 foreground and background colors as `unspecified', for
5 compatibility with 20.x. 8 compatibility with 20.x.
diff --git a/lisp/server.el b/lisp/server.el
index e362c8e5607..e4a451c364a 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -390,6 +390,7 @@ or nil. KILLED is t if we killed BUFFER
390 (set-buffer buffer) 390 (set-buffer buffer)
391 server-existing-buffer)) 391 server-existing-buffer))
392 (setq killed t) 392 (setq killed t)
393 (bury-buffer buffer)
393 (kill-buffer buffer)) 394 (kill-buffer buffer))
394 (unless killed 395 (unless killed
395 (if (server-temp-file-p buffer) 396 (if (server-temp-file-p buffer)