2 files changed, 18 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76dfeb27f05..f02cfe5d894 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * server.el (server-save-buffers-kill-terminal): Check the `proc' is
+        indeed a process.
+
 2007-12-23  Richard Stallman  <rms@gnu.org>
 
         * simple.el (region-active-p): New function.
diff --git a/lisp/server.el b/lisp/server.el
index 4d21959774a..dc534adc0f9 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1260,21 +1260,25 @@ done that."
 
 ;;;###autoload
 (defun server-save-buffers-kill-terminal (proc &optional arg)
+  ;; Called from save-buffers-kill-terminal in files.el.
   "Offer to save each buffer, then kill PROC.
 
 With prefix arg, silently save all file-visiting buffers, then kill.
 
 If emacsclient was started with a list of filenames to edit, then
 only these files will be asked to be saved."
-  (let ((buffers (process-get proc 'buffers)))
-    ;; If client is bufferless, emulate a normal Emacs session
-    ;; exit and offer to save all buffers.  Otherwise, offer to
-    ;; save only the buffers belonging to the client.
-    (save-some-buffers arg
-                       (if buffers
-                           (lambda () (memq (current-buffer) buffers))
-                         t))
-    (server-delete-client proc)))
+  ;; save-buffers-kill-terminal occasionally calls us with proc set
+  ;; to `nowait' (comes from the value of the `client' frame parameter).
+  (when (processp proc)
+    (let ((buffers (process-get proc 'buffers)))
+      ;; If client is bufferless, emulate a normal Emacs session
+      ;; exit and offer to save all buffers.  Otherwise, offer to
+      ;; save only the buffers belonging to the client.
+      (save-some-buffers arg
+                         (if buffers
+                             (lambda () (memq (current-buffer) buffers))
+                           t))
+      (server-delete-client proc))))
 
 (define-key ctl-x-map "#" 'server-edit)