diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-06-29 03:25:10 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-06-29 03:25:10 +0000 |
| commit | 2d25aa5a909ceb40b8ddacc04caf6a9c90d13522 (patch) | |
| tree | 237a1883802da0c69739c49d35b283e3db05ea84 /lisp | |
| parent | 347f3cd3dd418025e2137f3c0b8dc9e32a991b31 (diff) | |
| download | emacs-2d25aa5a909ceb40b8ddacc04caf6a9c90d13522.tar.gz | |
* server.el (server-buffer-done): Prevent kill-buffer from
prompting by clearing the buffer modification flag (Bug#3696).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/server.el | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1adda939100..85ffe8c9a73 100644 --- 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 10b08ad4a3b..e06fb030e78 100644 --- 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))))))) |