* etags.c (CNL_SAVE_DEFINEDEF): Set linecharno for use by readline.

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

diff --git a/lisp/rlogin.el b/lisp/rlogin.el
index a37175c..88e32b1 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.24 1995/02/28 09:51:49 friedman Exp rms $
+;; $Id: rlogin.el,v 1.31 1996/01/14 07:34:30 erik Exp friedman $
 
 ;;; Commentary:
 
@@ -102,8 +105,10 @@ this variable is set from that.")
 \f
 ;;;###autoload (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)")
 
+(defvar rlogin-history nil)
+
 ;;;###autoload
-(defun rlogin (input-args &optional prefix)
+(defun rlogin (input-args &optional buffer)
   "Open a network login connection to HOST via the `rlogin' program.
 Input is sent line-at-a-time to the remote connection.
 
@@ -112,6 +117,9 @@ 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
+buffer, it names the buffer to use.
+
 The variable `rlogin-program' contains the name of the actual program to
 run.  It can be a relative or absolute path.
 
@@ -134,7 +142,8 @@ If you wish to change directory tracking styles during a session, use the
 function `rlogin-directory-tracking-mode' rather than simply setting the
 variable."
   (interactive (list
-               (read-from-minibuffer "rlogin arguments (hostname first): ")
+               (read-from-minibuffer "rlogin arguments (hostname first): "
+                                     nil nil nil 'rlogin-history)
                current-prefix-arg))
 
   (let* ((process-connection-type rlogin-process-connection-type)
@@ -150,36 +159,35 @@ variable."
                         (format "*rlogin-%s@%s*" user host)))
         proc)
 
+    (cond ((null 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
-     ((and (null prefix)
-           (comint-check-proc buffer-name))
-      (pop-to-buffer buffer-name))
-     ;; This next case is done all in the predicate (including side effects
-     ;; like pop-to-buffer) to avoid extra string consing via multiple
-     ;; concats.
-     ((and (numberp prefix)
-           (let ((bufname (concat buffer-name "<" prefix ">")))
-             (and (comint-check-proc bufname)
-                  (pop-to-buffer bufname)))))
+     ((comint-check-proc buffer-name))
      (t
-      (cond
-       ((numberp prefix)
-        (setq buffer-name (concat buffer-name "<" prefix ">")))
-       (t
-        (setq buffer-name (generate-new-buffer-name buffer-name))))
-      (pop-to-buffer buffer-name)
-      (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)
@@ -230,18 +238,18 @@ local one share the same directories (through NFS)."
    ((or (null prefix)
         (consp prefix))
     (setq rlogin-directory-tracking-mode t)
-    (setq shell-dirtrack-p t)
+    (setq shell-dirtrackp t)
     (setq comint-file-name-prefix
           (concat "/" rlogin-remote-user "@" rlogin-host ":")))
    ((< prefix 0)
     (setq rlogin-directory-tracking-mode nil)
-    (setq shell-dirtrack-p nil))
+    (setq shell-dirtrackp nil))
    (t
     (setq rlogin-directory-tracking-mode 'local)
     (setq comint-file-name-prefix "")
-    (setq shell-dirtrack-p t)))
+    (setq shell-dirtrackp t)))
   (cond
-   (shell-dirtrack-p
+   (shell-dirtrackp
     (let* ((proc (get-buffer-process (current-buffer)))
            (proc-mark (process-mark proc))
            (current-input (buffer-substring proc-mark (point-max)))