(help-for-help): Update help text.

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

diff --git a/lisp/telnet.el b/lisp/telnet.el
index 27de4ff..d05c249 100644 (file)
--- a/lisp/telnet.el
+++ b/lisp/telnet.el
@@ -1,6 +1,6 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
 
-;;; Copyright (C) 1985, 1988, 1992, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994 Free Software Foundation, Inc.
 
 ;; Author: William F. Schelter
 ;; Maintainer: FSF
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, 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.
 
 ;;; Commentary:
 
@@ -66,11 +67,6 @@
 (defvar telnet-program "telnet"
   "Program to run to open a telnet connection.")
 
-(defvar rsh-program
-  (if (memq system-type '(hpux usg-unix-v)) 
-      "remsh" "rsh")
-  "Program to run for opening a remote shell.")
-
 (defvar telnet-initial-count -50
   "Initial value of `telnet-count'.  Should be set to the negative of the
 number of terminal writes telnet will make setting up the host connection.")
@@ -125,19 +121,20 @@ rejecting one login and prompting again for a username and password.")
 
 (defun telnet-initial-filter (proc string)
   ;For reading up to and including password; also will get machine type.
-  (cond ((string-match "No such host" string)
-        (kill-buffer (process-buffer proc))
-        (error "No such host."))
-       ((string-match "passw" string)
-        (telnet-filter proc string)
-        (setq telnet-count 0)
-        (send-string proc (concat (comint-read-noecho "Password: " t)
-                                  telnet-new-line)))
-       (t (telnet-check-software-type-initialize string)
+  (let ((case-fold-search t))
+    (cond ((string-match "No such host" string)
+          (kill-buffer (process-buffer proc))
+          (error "No such host"))
+         ((string-match "passw" string)
           (telnet-filter proc string)
-          (cond ((> telnet-count telnet-maximum-count)
-                 (set-process-filter proc 'telnet-filter))
-                (t (setq telnet-count (1+ telnet-count)))))))
+          (setq telnet-count 0)
+          (send-string proc (concat (comint-read-noecho "Password: " t)
+                                    telnet-new-line)))
+         (t (telnet-check-software-type-initialize string)
+            (telnet-filter proc string)
+            (cond ((> telnet-count telnet-maximum-count)
+                   (set-process-filter proc 'telnet-filter))
+                  (t (setq telnet-count (1+ telnet-count))))))))
 
 ;; Identical to comint-simple-send, except that it sends telnet-new-line
 ;; instead of "\n".
@@ -179,6 +176,8 @@ rejecting one login and prompting again for a username and password.")
       (delete-region comint-last-input-start
                     comint-last-input-end)))
 
+;;;###autoload (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)")
+
 ;;;###autoload
 (defun telnet (host)
   "Open a network login connection to host named HOST (a string).
@@ -190,8 +189,8 @@ Normally input is edited in Emacs and sent a line at a time."
         (buffer (get-buffer (concat "*" name "*")))
         process)
     (if (and buffer (get-buffer-process buffer))
-       (switch-to-buffer (concat "*" name "*"))
-      (switch-to-buffer (make-comint name telnet-program))
+       (pop-to-buffer (concat "*" name "*"))
+      (pop-to-buffer (make-comint name telnet-program))
       (setq process (get-buffer-process (current-buffer)))
       (set-process-filter process 'telnet-initial-filter)
       ;; Don't send the `open' cmd till telnet is ready for it.
@@ -202,6 +201,8 @@ Normally input is edited in Emacs and sent a line at a time."
       (setq comint-input-sender 'telnet-simple-send)
       (setq telnet-count telnet-initial-count))))
 
+(put 'telnet-mode 'mode-class 'special)
+
 (defun telnet-mode ()
   "This mode is for using telnet (or rsh) from a buffer to another host.
 It has most of the same commands as comint-mode.
@@ -219,15 +220,17 @@ Data is sent to the remote host when RET is typed.
   (use-local-map telnet-mode-map)
   (run-hooks 'telnet-mode-hook))
 
+;;;###autoload (add-hook 'same-window-regexps "\\*rsh-[^-]*\\*\\(\\|<[0-9]*>\\)")
+
 ;;;###autoload
 (defun rsh (host)
   "Open a network login connection to host named HOST (a string).
-Communication with HOST is recorded in a buffer *HOST-rsh*.
+Communication with HOST is recorded in a buffer `*rsh-HOST*'.
 Normally input is edited in Emacs and sent a line at a time."
   (interactive "sOpen rsh connection to host: ")
   (require 'shell)
-  (let ((name (concat host "-rsh" )))
-    (switch-to-buffer (make-comint name rsh-program nil host))
+  (let ((name (concat "rsh-" host )))
+    (pop-to-buffer (make-comint name remote-shell-program nil host))
     (set-process-filter (get-process name) 'telnet-initial-filter)
     (telnet-mode)
     (setq telnet-count -16)))