HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-commit of loaddefs files.
[bpt/emacs.git]
/
lisp
/
talk.el
diff --git
a/lisp/talk.el
b/lisp/talk.el
index
27b7caf
..
741571a
100644
(file)
--- a/
lisp/talk.el
+++ b/
lisp/talk.el
@@
-1,7
+1,6
@@
;;; talk.el --- allow several users to talk to each other through Emacs
;;; talk.el --- allow several users to talk to each other through Emacs
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: comm, frames
;; 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)
(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))
(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))
(terminal-name (frame-terminal (selected-frame))))
(error "Unknown frame type")))
(talk-update-buffers))
@@
-113,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)))
(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))))
(other-window 1))
(select-window (frame-first-window frame)))
(select-frame old-frame))))