mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
(talk): Simplify. Pass display arg to talk-add-display as a string.
(talk-add-display): Simplify. Accept only string args.
This commit is contained in:
parent
0d5c702de0
commit
a1feed48fe
1 changed files with 10 additions and 17 deletions
27
lisp/talk.el
27
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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue