From a1feed48fe2e123e7306c96e19a383f47965528a Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 13 May 2008 20:50:32 +0000 Subject: [PATCH] (talk): Simplify. Pass display arg to talk-add-display as a string. (talk-add-display): Simplify. Accept only string args. --- lisp/talk.el | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/lisp/talk.el b/lisp/talk.el index eb3d9d3d9a5..bbb8cda62f7 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -50,26 +50,19 @@ Each element has the form (DISPLAY FRAME BUFFER).") (interactive) (let ((type (frame-live-p (selected-frame))) (display (frame-terminal (selected-frame)))) - (cond - ((eq type t) - (talk-add-display (selected-frame))) - ((eq type 'x) - (talk-add-display (frame-terminal (selected-frame)))) - (t - (error "Unknown frame type")))) + (if (or (eq type t) (eq type 'x)) + (talk-add-display + (terminal-name (frame-terminal (selected-frame)))) + (error "Unknown frame type"))) (talk-update-buffers)) -(defun talk-add-display (frame) - (let* ((display (if (frame-live-p frame) - (frame-terminal frame) - frame)) - (elt (assoc display talk-display-alist)) - (name (concat "*talk-" (terminal-name display) "*")) - buffer) - (unless (frame-live-p frame) - (setq frame (make-frame-on-display display (list (cons 'name name))))) +(defun talk-add-display (display) + (let* ((elt (assoc display talk-display-alist)) + (name (concat "*talk-" display "*")) + frame buffer) (if (and elt (frame-live-p (nth 1 elt))) - (setq frame (nth 1 elt))) + (setq frame (nth 1 elt)) + (setq frame (make-frame-on-display display (list (cons 'name name))))) (if (not (and elt (buffer-name (get-buffer (setq buffer (nth 2 elt)))))) (setq buffer (get-buffer-create name))) (add-to-list 'delete-frame-functions 'talk-handle-delete-frame) -- 2.39.5