emacs: lisp/server.el comparison

Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306

comparison

equal deleted inserted replaced

-:7774e5860c70
+:56a72e2bd635
 (when server-raise-frame
 (select-frame-set-input-focus (window-frame (selected-window))))))
 ;;;###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)))
+;; save-buffers-kill-terminal occasionally calls us with proc set
-;; If client is bufferless, emulate a normal Emacs session
+;; to `nowait' (comes from the value of the `client' frame parameter).
-;; exit and offer to save all buffers.  Otherwise, offer to
+(when (processp proc)
-;; save only the buffers belonging to the client.
+(let ((buffers (process-get proc 'buffers)))
-(save-some-buffers arg
+;; If client is bufferless, emulate a normal Emacs session
-		       (if buffers
+;; exit and offer to save all buffers.  Otherwise, offer to
-			   (lambda () (memq (current-buffer) buffers))
+;; save only the buffers belonging to the client.
-			 t))
+(save-some-buffers arg
-(server-delete-client proc)))
+(if buffers
+(lambda () (memq (current-buffer) buffers))
+t))
+(server-delete-client proc))))
 (define-key ctl-x-map "#" 'server-edit)
 (defun server-unload-function ()
 "Unload the server library."

Mercurial > emacs