aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2005-05-18 10:18:42 +0000
committerJuanma Barranquero2005-05-18 10:18:42 +0000
commitff660307553247f16a8badc658dee8061f5f89bd (patch)
tree5f9587a7733cbff8c9ef463da87c3bfefefd0dde
parent887195ac8398ff3569c5fc45c4566f3c6bce2e3a (diff)
downloademacs-ff660307553247f16a8badc658dee8061f5f89bd.tar.gz
emacs-ff660307553247f16a8badc658dee8061f5f89bd.zip
Replace `send-string' by `process-send-string'.
-rw-r--r--lisp/net/ange-ftp.el26
-rw-r--r--lisp/net/telnet.el24
-rw-r--r--lisp/terminal.el2
3 files changed, 26 insertions, 26 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 880e29bd3be..7fd07ebccfb 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1646,7 +1646,7 @@ good, skip, fatal, or unknown."
1646 ;; if we gave an empty password to the USER command earlier 1646 ;; if we gave an empty password to the USER command earlier
1647 ;; then we should send a null password now. 1647 ;; then we should send a null password now.
1648 (if (string-match "Password: *$" ange-ftp-process-string) 1648 (if (string-match "Password: *$" ange-ftp-process-string)
1649 (send-string proc "\n")))) 1649 (process-send-string proc "\n"))))
1650 (while (and ange-ftp-process-busy 1650 (while (and ange-ftp-process-busy
1651 (string-match "\n" ange-ftp-process-string)) 1651 (string-match "\n" ange-ftp-process-string))
1652 (let ((line (substring ange-ftp-process-string 1652 (let ((line (substring ange-ftp-process-string
@@ -1741,18 +1741,18 @@ good, skip, fatal, or unknown."
1741 ;; Replace STR by the result of the comint processing. 1741 ;; Replace STR by the result of the comint processing.
1742 (setq str (buffer-substring comint-last-output-start (process-mark proc)))) 1742 (setq str (buffer-substring comint-last-output-start (process-mark proc))))
1743 (cond ((string-match "login: *$" str) 1743 (cond ((string-match "login: *$" str)
1744 (send-string proc 1744 (process-send-string proc
1745 (concat 1745 (concat
1746 (let ((ange-ftp-default-user t)) 1746 (let ((ange-ftp-default-user t))
1747 (ange-ftp-get-user ange-ftp-gateway-host)) 1747 (ange-ftp-get-user ange-ftp-gateway-host))
1748 "\n"))) 1748 "\n")))
1749 ((string-match "Password: *$" str) 1749 ((string-match "Password: *$" str)
1750 (send-string proc 1750 (process-send-string proc
1751 (concat 1751 (concat
1752 (ange-ftp-get-passwd ange-ftp-gateway-host 1752 (ange-ftp-get-passwd ange-ftp-gateway-host
1753 (ange-ftp-get-user 1753 (ange-ftp-get-user
1754 ange-ftp-gateway-host)) 1754 ange-ftp-gateway-host))
1755 "\n"))) 1755 "\n")))
1756 ((string-match ange-ftp-gateway-fatal-msgs str) 1756 ((string-match ange-ftp-gateway-fatal-msgs str)
1757 (delete-process proc) 1757 (delete-process proc)
1758 (setq ange-ftp-gwp-running nil)) 1758 (setq ange-ftp-gwp-running nil))
@@ -1835,7 +1835,7 @@ been queued with no result. CONT will still be called, however."
1835 (insert (substring cmd 0 (match-end 0)) " Turtle Power!\n") 1835 (insert (substring cmd 0 (match-end 0)) " Turtle Power!\n")
1836 (insert cmd))) 1836 (insert cmd)))
1837 (move-marker comint-last-input-end (point)) 1837 (move-marker comint-last-input-end (point))
1838 (send-string proc cmd) 1838 (process-send-string proc cmd)
1839 (set-marker (process-mark proc) (point)) 1839 (set-marker (process-mark proc) (point))
1840 (if nowait 1840 (if nowait
1841 nil 1841 nil
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 67edf6b0d46..94a7b325d0e 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -91,19 +91,19 @@ rejecting one login and prompting again for a username and password.")
91(defun telnet-interrupt-subjob () 91(defun telnet-interrupt-subjob ()
92 "Interrupt the program running through telnet on the remote host." 92 "Interrupt the program running through telnet on the remote host."
93 (interactive) 93 (interactive)
94 (send-string nil telnet-interrupt-string)) 94 (process-send-string nil telnet-interrupt-string))
95 95
96(defun telnet-c-z () 96(defun telnet-c-z ()
97 (interactive) 97 (interactive)
98 (send-string nil "\C-z")) 98 (process-send-string nil "\C-z"))
99 99
100(defun send-process-next-char () 100(defun send-process-next-char ()
101 (interactive) 101 (interactive)
102 (send-string nil 102 (process-send-string nil
103 (char-to-string 103 (char-to-string
104 (let ((inhibit-quit t)) 104 (let ((inhibit-quit t))
105 (prog1 (read-char) 105 (prog1 (read-char)
106 (setq quit-flag nil)))))) 106 (setq quit-flag nil))))))
107 107
108; initialization on first load. 108; initialization on first load.
109(if telnet-mode-map 109(if telnet-mode-map
@@ -141,8 +141,8 @@ rejecting one login and prompting again for a username and password.")
141 ((string-match "passw" string) 141 ((string-match "passw" string)
142 (telnet-filter proc string) 142 (telnet-filter proc string)
143 (setq telnet-count 0) 143 (setq telnet-count 0)
144 (send-string proc (concat (comint-read-noecho "Password: " t) 144 (process-send-string proc (concat (comint-read-noecho "Password: " t)
145 telnet-new-line)) 145 telnet-new-line))
146 (clear-this-command-keys)) 146 (clear-this-command-keys))
147 (t (telnet-check-software-type-initialize string) 147 (t (telnet-check-software-type-initialize string)
148 (telnet-filter proc string) 148 (telnet-filter proc string)
@@ -231,9 +231,9 @@ Normally input is edited in Emacs and sent a line at a time."
231 ;; Don't send the `open' cmd till telnet is ready for it. 231 ;; Don't send the `open' cmd till telnet is ready for it.
232 (accept-process-output process) 232 (accept-process-output process)
233 (erase-buffer) 233 (erase-buffer)
234 (send-string process (concat "open " host 234 (process-send-string process (concat "open " host
235 (if port " " "") (or port "") 235 (if port " " "") (or port "")
236 "\n")) 236 "\n"))
237 (telnet-mode) 237 (telnet-mode)
238 (setq comint-input-sender 'telnet-simple-send) 238 (setq comint-input-sender 'telnet-simple-send)
239 (setq telnet-count telnet-initial-count)))) 239 (setq telnet-count telnet-initial-count))))
diff --git a/lisp/terminal.el b/lisp/terminal.el
index d33ba914cd3..b84b1b6ed00 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -489,7 +489,7 @@ lets you type a terminal emulator command."
489 (progn 489 (progn
490 (and terminal-more-processing (null (cdr te-pending-output)) 490 (and terminal-more-processing (null (cdr te-pending-output))
491 (te-set-more-count nil)) 491 (te-set-more-count nil))
492 (send-string te-process (make-string 1 last-input-char)) 492 (process-send-string te-process (make-string 1 last-input-char))
493 (te-process-output t)) 493 (te-process-output t))
494 (message "Function key `%s' ignored" 494 (message "Function key `%s' ignored"
495 (single-key-description last-input-char)))))) 495 (single-key-description last-input-char))))))