X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b14e3e21ec6702d27257a1400681fc36ee10282f..5010583555fce883d83e7a50e26d9d34f9e108ce:/lisp/talk.el diff --git a/lisp/talk.el b/lisp/talk.el index fd845a7eee..741571a8d7 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -1,6 +1,6 @@ ;;; talk.el --- allow several users to talk to each other through Emacs -;; Copyright (C) 1995, 2001-2011 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: comm, frames @@ -47,10 +47,9 @@ Each element has the form (DISPLAY FRAME BUFFER).") (defun talk () "Connect to the Emacs talk group from the current X display or tty frame." (interactive) - (let ((type (frame-live-p (selected-frame))) - (display (frame-terminal (selected-frame)))) + (let ((type (frame-live-p (selected-frame)))) (if (or (eq type t) (eq type 'x)) - (talk-add-display + (talk-add-display (terminal-name (frame-terminal (selected-frame)))) (error "Unknown frame type"))) (talk-update-buffers)) @@ -112,7 +111,7 @@ Select the first of these windows, displaying the first of the buffers." (while (progn (switch-to-buffer (car buffers)) (setq buffers (cdr buffers))) - (split-window-vertically lines-per-buffer) + (split-window-below lines-per-buffer) (other-window 1)) (select-window (frame-first-window frame))) (select-frame old-frame))))