X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ldisc.c;h=131cc428de2ae1cdffbc160e0e23a61861fecf14;hb=869989e7e66524b8d412e70be0b72080cf0e9fac;hp=e464c1312719233f11a26dafe6d3a63f9ebd3239;hpb=830c1ea580cb7adbf5f484797e8c13ae6d72a5f2;p=PuTTY.git

diff --git a/ldisc.c b/ldisc.c
index e464c131..131cc428 100644
--- a/ldisc.c
+++ b/ldisc.c
@@ -200,7 +200,7 @@ void ldisc_send(char *buf, int len, int interactive)
 			back->send(term_buf, term_buflen);
 		    if (cfg.protocol == PROT_RAW)
 			back->send("\r\n", 2);
-		    else if (cfg.protocol == PROT_TELNET)
+		    else if (cfg.protocol == PROT_TELNET && cfg.telnet_newline)
 			back->special(TS_EOL);
 		    else
 			back->send("\r", 1);
@@ -237,7 +237,10 @@ void ldisc_send(char *buf, int len, int interactive)
 	    if (keyflag && cfg.protocol == PROT_TELNET && len == 1) {
 		switch (buf[0]) {
 		  case CTRL('M'):
-		    back->special(TS_EOL);
+		    if (cfg.protocol == PROT_TELNET && cfg.telnet_newline)
+			back->special(TS_EOL);
+		    else
+			back->send("\r", 1);
 		    break;
 		  case CTRL('?'):
 		  case CTRL('H'):