(dired-unmark-all-files): Read the arg as just a char.

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

diff --git a/lisp/telnet.el b/lisp/telnet.el
index c3513f6..5fb439a 100644 (file)
--- a/lisp/telnet.el
+++ b/lisp/telnet.el
@@ -1,10 +1,15 @@
-;; Copyright (C) 1985, 1988 Free Software Foundation, Inc.
+;;; telnet.el --- run a telnet session from within an Emacs buffer
+
+;;; Copyright (C) 1985, 1988, 1992 Free Software Foundation, Inc.
+
+;; Author: William F. Schelter
+;; Maintainer: FSF
 
 ;; 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 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -16,7 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;; Author William F. Schelter
+;;; Code:
 
 ;;to do fix software types for lispm:
 ;;to eval current expression.  Also to try to send escape keys correctly.
@@ -27,7 +32,6 @@
 ;; manner
 
 (require 'comint)
-(provide 'telnet)
 
 (defvar telnet-new-line "\r")
 (defvar telnet-mode-map nil)
@@ -44,11 +48,11 @@
 while looking for the initial password.")
 
 (defvar telnet-initial-count -50
-  "Initial value of telnet-count.  Should be set to the negative of the
+  "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.")
 
 (defvar telnet-maximum-count 4
-  "Maximum value telnet-count can have.
+  "Maximum value `telnet-count' can have.
 After this many passes, we stop looking for initial setup data.
 Should be set to the number of terminal writes telnet will make
 rejecting one login and prompting for the again for a username and password.")
@@ -120,6 +124,7 @@ rejecting one login and prompting for the again for a username and password.")
       (set-buffer (process-buffer proc))
       (goto-char (process-mark proc))
       (let ((now (point)))
+       ;; Insert STRING, omitting all C-m characters.
        (let ((index 0) c-m)
          (while (setq c-m (string-match "\C-m" string index))
            (insert-before-markers (substring string index c-m))
@@ -137,7 +142,11 @@ rejecting one login and prompting for the again for a username and password.")
 
 (defun telnet-send-input ()
   (interactive)
-  (comint-send-input telnet-new-line telnet-remote-echoes))
+;  (comint-send-input telnet-new-line telnet-remote-echoes)
+  (comint-send-input)
+  (if telnet-remote-echoes
+      (delete-region comint-last-input-start
+                    comint-last-input-end)))
 
 ;;;###autoload
 (defun telnet (arg)
@@ -148,14 +157,16 @@ Normally input is edited in Emacs and sent a line at a time."
   (let ((name (concat arg "-telnet" )))
     (switch-to-buffer (make-comint name "telnet"))
     (set-process-filter (get-process name) 'telnet-initial-filter)
+    ;; Don't send the `open' cmd till telnet is ready for it.
+    (accept-process-output (get-process name))
     (erase-buffer)
     (send-string  name (concat "open " arg "\n"))
     (telnet-mode)
     (setq telnet-count telnet-initial-count)))
 
 (defun telnet-mode ()
-  "This mode is for use during telnet from a buffer to another
-host. It has most of the same commands as comint-mode.
+  "This mode is for telnetting from a buffer to another host.
+It has most of the same commands as comint-mode.
 There is a variable ``telnet-interrupt-string'' which is the character
 sent to try to stop execution of a job on the remote host.
 Data is sent to the remote host when RET is typed.
@@ -179,3 +190,7 @@ Bugs:
             (setq quit-flag nil))
       (setq answ (concat answ (char-to-string tem))))
     answ))
+
+(provide 'telnet)
+
+;;; telnet.el ends here