[Emacs-diffs] Changes to emacs/lisp/net/telnet.el

[Juanma Barranquero]

Index: emacs/lisp/net/telnet.el
diff -c emacs/lisp/net/telnet.el:1.10 emacs/lisp/net/telnet.el:1.11
*** emacs/lisp/net/telnet.el:1.10       Tue May 17 16:24:37 2005
--- emacs/lisp/net/telnet.el    Wed May 18 10:18:42 2005
***************
*** 91,109 ****
  (defun telnet-interrupt-subjob ()
    "Interrupt the program running through telnet on the remote host."
    (interactive)
!   (send-string nil telnet-interrupt-string))
  
  (defun telnet-c-z ()
    (interactive)
!   (send-string nil "\C-z"))
  
  (defun send-process-next-char ()
    (interactive)
!   (send-string nil
!              (char-to-string
!               (let ((inhibit-quit t))
!                 (prog1 (read-char)
!                   (setq quit-flag nil))))))
  
  ; initialization on first load.
  (if telnet-mode-map
--- 91,109 ----
  (defun telnet-interrupt-subjob ()
    "Interrupt the program running through telnet on the remote host."
    (interactive)
!   (process-send-string nil telnet-interrupt-string))
  
  (defun telnet-c-z ()
    (interactive)
!   (process-send-string nil "\C-z"))
  
  (defun send-process-next-char ()
    (interactive)
!   (process-send-string nil
!                        (char-to-string
!                         (let ((inhibit-quit t))
!                           (prog1 (read-char)
!                             (setq quit-flag nil))))))
  
  ; initialization on first load.
  (if telnet-mode-map
***************
*** 141,148 ****
            ((string-match "passw" string)
             (telnet-filter proc string)
             (setq telnet-count 0)
!            (send-string proc (concat (comint-read-noecho "Password: " t)
!                                      telnet-new-line))
             (clear-this-command-keys))
            (t (telnet-check-software-type-initialize string)
               (telnet-filter proc string)
--- 141,148 ----
            ((string-match "passw" string)
             (telnet-filter proc string)
             (setq telnet-count 0)
!            (process-send-string proc (concat (comint-read-noecho "Password: " 
t)
!                                                telnet-new-line))
             (clear-this-command-keys))
            (t (telnet-check-software-type-initialize string)
               (telnet-filter proc string)
***************
*** 231,239 ****
        ;; Don't send the `open' cmd till telnet is ready for it.
        (accept-process-output process)
        (erase-buffer)
!       (send-string process (concat "open " host
!                                  (if port " " "") (or port "")
!                                  "\n"))
        (telnet-mode)
        (setq comint-input-sender 'telnet-simple-send)
        (setq telnet-count telnet-initial-count))))
--- 231,239 ----
        ;; Don't send the `open' cmd till telnet is ready for it.
        (accept-process-output process)
        (erase-buffer)
!       (process-send-string process (concat "open " host
!                                            (if port " " "") (or port "")
!                                            "\n"))
        (telnet-mode)
        (setq comint-input-sender 'telnet-simple-send)
        (setq telnet-count telnet-initial-count))))