[Emacs-diffs] emacs/lisp ChangeLog server.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/06/29 03:25:14

Modified files:
        lisp           : ChangeLog server.el 

Log message:
        * server.el (server-buffer-done): Prevent kill-buffer from
        prompting by clearing the buffer modification flag (Bug#3696).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15739&r2=1.15740
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.192&r2=1.193

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15739
retrieving revision 1.15740
diff -u -b -r1.15739 -r1.15740
--- ChangeLog   28 Jun 2009 17:52:45 -0000      1.15739
+++ ChangeLog   29 Jun 2009 03:25:10 -0000      1.15740
@@ -1,3 +1,8 @@
+2009-06-29  Chong Yidong  <address@hidden>
+
+       * server.el (server-buffer-done): Prevent kill-buffer from
+       prompting by clearing the buffer modification flag (Bug#3696).
+
 2009-06-28  Michael McNamara  <address@hidden>
 
        * verilog-mode.el (verilog-beg-of-statement)

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -b -r1.192 -r1.193
--- server.el   10 Mar 2009 14:09:26 -0000      1.192
+++ server.el   29 Jun 2009 03:25:14 -0000      1.193
@@ -1202,10 +1202,15 @@
                         (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)))))))