X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/2a8a449c327ff7620a9f35b1c71442579b999ee7..a57cd64bc1a34bd8d8ca6ab1c9deb9c3eb1cdc6a:/ldisc.c

diff --git a/ldisc.c b/ldisc.c
index e464c131..e6a110b1 100644
--- a/ldisc.c
+++ b/ldisc.c
@@ -5,7 +5,6 @@
  * depending on what's currently configured.
  */
 
-#include <windows.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -200,7 +199,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 +236,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'):