HideIfDef mode bug fixes and enhancements. This is #2 of 3 patches based

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

diff --git a/lisp/talk.el b/lisp/talk.el
index eb3d9d3..1678036 100644 (file)
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -1,9 +1,8 @@
 ;;; 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-2014 Free Software Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, frames
 
 ;; This file is part of GNU Emacs.
@@ -48,28 +47,20 @@ 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))))
-    (cond
-     ((eq type t)
-      (talk-add-display (selected-frame)))
-     ((eq type 'x)
-      (talk-add-display (frame-terminal (selected-frame))))
-     (t
-      (error "Unknown frame type"))))
+  (let ((type (frame-live-p (selected-frame))))
+    (if (or (eq type t) (eq type 'x))
+       (talk-add-display
+        (terminal-name (frame-terminal)))
+      (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)
@@ -120,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