[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/talk.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/talk.el,v |
Date: |
Tue, 13 May 2008 20:50:36 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/05/13 20:50:33
Index: talk.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/talk.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- talk.el 6 May 2008 07:57:53 -0000 1.17
+++ talk.el 13 May 2008 20:50:32 -0000 1.18
@@ -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)
- (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)