comparison lisp/server.el @ 82985:8d7be2534cbc

Delete server frames on server restart. lisp/server.el (server-start): Delete any remaining opened frames of the previous server. (server-sentinel, server-process-filter): Force deleting the frame. (server-buffer-done): Ditto. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-25

82984:3b1f99f17618

    ;; Remove PROC from the list of clients.
    (when client
      (setq server-clients (delq client server-clients))
      (let ((frame (assq (car client) server-frames)))
	(setq server-frames (delq frame server-frames))
	(when (frame-live-p (cadr frame)) (delete-frame (cadr frame))))
      (dolist (buf (cdr client))
	(with-current-buffer buf
	  ;; Remove PROC from the clients of each buffer.
	  (setq server-buffer-clients (delq proc server-buffer-clients))
	  ;; Kill the buffer if necessary.

  (condition-case () (delete-file server-socket-name) (error nil))
  ;; If this Emacs already had a server, clear out associated status.
  (while server-clients
    (let ((buffer (nth 1 (car server-clients))))
      (server-buffer-done buffer)))
  (unless leave-dead
    (if server-process
	(server-log (message "Restarting server")))
    (letf (((default-file-modes) ?\700))
      (setq server-process

      (if (null (cdr client))
	  ;; This client is empty; get rid of it immediately.
	  (progn
	    (let ((frame (assq (car client) server-frames)))
	      (setq server-frames (delq frame server-frames))
	      (when (frame-live-p (cadr frame)) (delete-frame (cadr frame))))
	    (delete-process proc)
	    (server-log "Close empty client" proc))
	;; We visited some buffer for this client.
	(or nowait (push client server-clients))
	(unless (or isearch-mode (minibufferp))

	;; If client now has no pending buffers,
	;; tell it that it is done, and forget it entirely.
	(unless (cdr client)
	  (let ((frame (assq (car client) server-frames)))
	    (setq server-frames (delq frame server-frames))
	    (when (frame-live-p (cadr frame)) (delete-frame (cadr frame))))
	  (delete-process (car client))
	  (server-log "Close" (car client))
	  (setq server-clients (delq client server-clients))))
      (setq old-clients (cdr old-clients)))
    (if (and (bufferp buffer) (buffer-name buffer))

82985:8d7be2534cbc

    ;; Remove PROC from the list of clients.
    (when client
      (setq server-clients (delq client server-clients))
      (let ((frame (assq (car client) server-frames)))
	(setq server-frames (delq frame server-frames))
	(when (frame-live-p (cadr frame)) (delete-frame (cadr frame) 'force)))
      (dolist (buf (cdr client))
	(with-current-buffer buf
	  ;; Remove PROC from the clients of each buffer.
	  (setq server-buffer-clients (delq proc server-buffer-clients))
	  ;; Kill the buffer if necessary.

  (condition-case () (delete-file server-socket-name) (error nil))
  ;; If this Emacs already had a server, clear out associated status.
  (while server-clients
    (let ((buffer (nth 1 (car server-clients))))
      (server-buffer-done buffer)))
  ;; Delete any remaining opened frames of the previous server.
  (while server-frames
    (let ((frame (cadar server-frames)))
      (setq server-frames (cdr server-frames))
      (when frame-live-p frame (delete-frame frame 'force))))
  (unless leave-dead
    (if server-process
	(server-log (message "Restarting server")))
    (letf (((default-file-modes) ?\700))
      (setq server-process

      (if (null (cdr client))
	  ;; This client is empty; get rid of it immediately.
	  (progn
	    (let ((frame (assq (car client) server-frames)))
	      (setq server-frames (delq frame server-frames))
	      (when (frame-live-p (cadr frame)) (delete-frame (cadr frame) 'force)))
	    (delete-process proc)
	    (server-log "Close empty client" proc))
	;; We visited some buffer for this client.
	(or nowait (push client server-clients))
	(unless (or isearch-mode (minibufferp))

	;; If client now has no pending buffers,
	;; tell it that it is done, and forget it entirely.
	(unless (cdr client)
	  (let ((frame (assq (car client) server-frames)))
	    (setq server-frames (delq frame server-frames))
	    (when (frame-live-p (cadr frame)) (delete-frame (cadr frame) 'force)))
	  (delete-process (car client))
	  (server-log "Close" (car client))
	  (setq server-clients (delq client server-clients))))
      (setq old-clients (cdr old-clients)))
    (if (and (bufferp buffer) (buffer-name buffer))