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

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

lisp/ChangeLog

+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)

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)))))))