(telnet-simple-send): Handle comint-input-sender-no-newline like

comint-simple-send.

2 files changed, 20 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d66d180873..2354c50a94 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2002-01-12  Richard M. Stallman  <[email protected]>
+
+	* net/telnet.el (telnet-simple-send): Handle
+	comint-input-sender-no-newline like comint-simple-send.
+
+	* progmodes/sql.el (sql-query-placeholders-and-send): Handle
+	comint-input-sender-no-newline like comint-simple-send.
+	(sql-escape-newlines-and-send): Likewise.
+
+	* comint.el (comint-input-sender): Doc fix.
+	(comint-input-sender-no-newline): New variable.
+	(comint-simple-send): If comint-input-sender-no-newline,
+	don't output newline, but maybe send eof.
+	(comint-send-input): New arg NO-NEWLINE.
+	(comint-send-eof): Call comint-send-eof with NO-NEWLINE.
+	
 2002-01-12  Pavel Jan,Bm(Bk  <[email protected]>
 
 	* textmodes/flyspell.el (flyspell-check-pre-word-p): Prevent
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index be4753caf5..8cdc2884ba 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -154,7 +154,10 @@ rejecting one login and prompting again for a username and password.")
 ;; instead of "\n".
 (defun telnet-simple-send (proc string)
   (comint-send-string proc string)
-  (comint-send-string proc telnet-new-line))
+  (if comint-input-sender-no-newline
+      (if (not (string-equal input ""))
+	  (process-send-eof))
+    (comint-send-string proc telnet-new-line)))
 
 (defun telnet-filter (proc string)
   (save-excursion