X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/142e26a72e9b8bbbec23c6bf7234e9f2544b5f89..ab422c4d6899b1442cb6954c1829c1fb656b006c:/lisp/talk.el diff --git a/lisp/talk.el b/lisp/talk.el index bbb8cda62f..741571a8d7 100644 --- a/lisp/talk.el +++ b/lisp/talk.el @@ -1,7 +1,6 @@ ;;; talk.el --- allow several users to talk to each other through Emacs -;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: comm, frames @@ -48,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)) @@ -113,12 +111,11 @@ 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)))) (provide 'talk) -;; arch-tag: 7ab0ad88-1788-4886-a44c-ae685e6f8a1a ;;; talk.el ends here