Merge from emacs--devo--0

[bpt/emacs.git] / lisp / talk.el

diff --git a/lisp/talk.el b/lisp/talk.el
index a008a0e..a46eadc 100644 (file)
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -1,6 +1,7 @@
 ;;; talk.el --- allow several users to talk to each other through Emacs
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: comm, frames
@@ -9,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -50,22 +51,22 @@ Each element has the form (DISPLAY FRAME BUFFER).")
   "Connect to the Emacs talk group from the current X display or tty frame."
   (interactive)
   (let ((type (frame-live-p (selected-frame)))
-       (display (frame-display (selected-frame))))
+       (display (frame-terminal (selected-frame))))
     (cond
      ((eq type t)
       (talk-add-display (selected-frame)))
      ((eq type 'x)
-      (talk-add-display (frame-display (selected-frame))))
+      (talk-add-display (frame-terminal (selected-frame))))
      (t
       (error "Unknown frame type"))))
   (talk-update-buffers))
 
 (defun talk-add-display (frame)
   (let* ((display (if (frame-live-p frame)
-                     (frame-display frame)
+                     (frame-terminal frame)
                    frame))
         (elt (assoc display talk-display-alist))
-        (name (concat "*talk-" (display-name display) "*"))
+        (name (concat "*talk-" (terminal-name display) "*"))
         buffer)
     (unless (frame-live-p frame)
       (setq frame (make-frame-on-display display (list (cons 'name name)))))