comparison lisp/server.el @ 83109:1707638677c9

Fix one more case of the previous error. lisp/server.el (server-delete-client): Added noframe parameter. (server-handle-delete-frame): Use it. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-149

83108:c7a76f7d323c

New clients have no properties."
  (unless (server-client proc)
    (setq server-clients (cons (cons proc nil)
			       server-clients))))

(defun server-delete-client (client)
  "Delete CLIENT, including its buffers, displays and frames."
  ;; Force a new lookup of client (prevents infinite recursion).
  (setq client (server-client
		(if (listp client) (car client) client)))
  (let ((proc (car client))
	(buffers (server-client-get client 'buffers)))

      (let ((tty (server-client-get client 'tty)))
	(when (and tty (server-tty-live-p tty))
	  (delete-tty tty)))

      ;; Delete the client's frames.
      (dolist (frame (frame-list))
	(if (and (frame-live-p frame)
		 (equal (car client) (frame-parameter frame 'client)))
	    (delete-frame frame)))

      ;; Delete the client's process.
      (if (eq (process-status (car client)) 'open)
	  (delete-process (car client)))

  (let ((proc (frame-parameter frame 'client)))
    (when (and proc (window-system frame))
      ;; (Closing a terminal frame must not trigger a delete;
      ;; we must wait for delete-tty-after-functions.)
      (server-log (format "server-handle-delete-frame, frame %s" frame) proc)
      (server-delete-client proc))))

(defun server-handle-suspend-tty (tty)
  "Notify the emacsclient process to suspend itself when its tty device is suspended."
  (dolist (proc (server-clients-with 'tty tty))
    (server-log (format "server-handle-suspend-tty, tty %s" tty) proc)

83109:1707638677c9

New clients have no properties."
  (unless (server-client proc)
    (setq server-clients (cons (cons proc nil)
			       server-clients))))

(defun server-delete-client (client &optional noframe)
  "Delete CLIENT, including its buffers, displays and frames.
If NOFRAME is non-nil, let the frames live.  (To be used from
`delete-frame-functions'."
  ;; Force a new lookup of client (prevents infinite recursion).
  (setq client (server-client
		(if (listp client) (car client) client)))
  (let ((proc (car client))
	(buffers (server-client-get client 'buffers)))

      (let ((tty (server-client-get client 'tty)))
	(when (and tty (server-tty-live-p tty))
	  (delete-tty tty)))

      ;; Delete the client's frames.
      (unless noframe
	(dolist (frame (frame-list))
	  (if (and (frame-live-p frame)
		   (equal (car client) (frame-parameter frame 'client)))
	      (delete-frame frame))))

      ;; Delete the client's process.
      (if (eq (process-status (car client)) 'open)
	  (delete-process (car client)))

  (let ((proc (frame-parameter frame 'client)))
    (when (and proc (window-system frame))
      ;; (Closing a terminal frame must not trigger a delete;
      ;; we must wait for delete-tty-after-functions.)
      (server-log (format "server-handle-delete-frame, frame %s" frame) proc)
      (server-delete-client proc 'noframe)))) ; Let delete-frame delete the frame later.

(defun server-handle-suspend-tty (tty)
  "Notify the emacsclient process to suspend itself when its tty device is suspended."
  (dolist (proc (server-clients-with 'tty tty))
    (server-log (format "server-handle-suspend-tty, tty %s" tty) proc)