# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1210711832 0
# Node ID c71ea3609cd7b024fc536037514577c7adac12fd
# Parent  052e05b479267841f24e45d90fd02fdb1f7749b1
(talk): Simplify.  Pass display arg to talk-add-display as a string.
(talk-add-display): Simplify.  Accept only string args.

diff -r 052e05b47926 -r c71ea3609cd7 lisp/talk.el
--- a/lisp/talk.el	Tue May 13 20:50:01 2008 +0000
+++ b/lisp/talk.el	Tue May 13 20:50:32 2008 +0000
@@ -50,26 +50,19 @@
   (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)
+(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 (make-frame-on-display display (list (cons 'name name)))))
-    (if (and elt (frame-live-p (nth 1 elt)))
-	(setq frame (nth 1 elt)))
     (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)