* server.el (server-buffer-done): Prevent kill-buffer from

prompting by clearing the buffer modification flag (Bug#3696).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1adda93910072bdcbcdd2e1d1a77fdb8c7208246..85ffe8c9a73a71c75c619f7b09ad5dbc4b2dc475 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29  Chong Yidong  <cyd@stupidchicken.com>
+
+       * server.el (server-buffer-done): Prevent kill-buffer from
+       prompting by clearing the buffer modification flag (Bug#3696).
+
 2009-06-28  Michael McNamara  <mac@mail.brushroad.com>
 
        * verilog-mode.el (verilog-beg-of-statement)

diff --git a/lisp/server.el b/lisp/server.el
index 10b08ad4a3bd8513ef75d1160d11be5b19455061..e06fb030e78efa740db563e95bbff1bd3f161f26 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1202,10 +1202,15 @@ FOR-KILLING if non-nil indicates that we are called from `kill-buffer'."
                         (not server-existing-buffer)))
              (setq killed t)
              (bury-buffer buffer)
+             ;; Prevent kill-buffer from prompting (Bug#3696).
+             (with-current-buffer buffer
+               (set-buffer-modified-p nil))
              (kill-buffer buffer))
            (unless killed
              (if (server-temp-file-p buffer)
                  (progn
+                   (with-current-buffer buffer
+                     (set-buffer-modified-p nil))
                    (kill-buffer buffer)
                    (setq killed t))
                (bury-buffer buffer)))))))