(mh-version): Use mh-e-RCS-id rather than mh-e-version

[gnu-emacs] / lisp / rlogin.el

diff --git a/lisp/rlogin.el b/lisp/rlogin.el
index c9dd71bd2a0ab7852a4e19f68005592d07044858..88e32b113f0825909374d1003974ec6ed03843b0 100644 (file)
--- a/lisp/rlogin.el
+++ b/lisp/rlogin.el
@@ -1,26 +1,29 @@
 ;;; rlogin.el --- remote login interface
 
+;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@prep.ai.mit.edu>
 ;; Keywords: unix, comm
 
-;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-;;
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; 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)
 ;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-;;
+
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to: The Free Software Foundation,
-;; Inc.; 675 Massachusetts Avenue.; Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
-;; $Id: rlogin.el,v 1.28 1995/05/12 17:51:12 roland Exp roland $
+;; $Id: rlogin.el,v 1.31 1996/01/14 07:34:30 erik Exp friedman $
 
 ;;; Commentary:
 
@@ -114,7 +117,7 @@ Communication with the remote host is recorded in a buffer `*rlogin-HOST*'
 If a prefix argument is given and the buffer `*rlogin-HOST*' already exists,
 a new buffer with a different connection will be made.
 
-When called from a program, if the optional second argument is a string or 
+When called from a program, if the optional second argument is a string or
 buffer, it names the buffer to use.
 
 The variable `rlogin-program' contains the name of the actual program to
@@ -157,29 +160,34 @@ variable."
         proc)
 
     (cond ((null buffer))
-         ((or (stringp buffer) (bufferp buffer))
+         ((stringp buffer)
           (setq buffer-name buffer))
+          ((bufferp buffer)
+           (setq buffer-name (buffer-name buffer)))
           ((numberp buffer)
            (setq buffer-name (format "%s<%d>" buffer-name buffer)))
           (t
            (setq buffer-name (generate-new-buffer-name buffer-name))))
 
+    (setq buffer (get-buffer-create buffer-name))
     (pop-to-buffer buffer-name)
+
     (cond
      ((comint-check-proc buffer-name))
      (t
-      (comint-exec (current-buffer) buffer-name rlogin-program nil args)
-      (setq proc (get-process buffer-name))
+      (comint-exec buffer buffer-name rlogin-program nil args)
+      (setq proc (get-buffer-process buffer))
       ;; Set process-mark to point-max in case there is text in the
       ;; buffer from a previous exited process.
       (set-marker (process-mark proc) (point-max))
-      (rlogin-mode)
 
       ;; comint-output-filter-functions is just like a hook, except that the
       ;; functions in that list are passed arguments.  add-hook serves well
       ;; enough for modifying it.
       (add-hook 'comint-output-filter-functions 'rlogin-carriage-filter)
 
+      (rlogin-mode)
+
       (make-local-variable 'rlogin-host)
       (setq rlogin-host host)
       (make-local-variable 'rlogin-remote-user)