X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2d3411e92334d83d913cac4298fb218dfaebe291..1ec0fa4b02303c385c1a8dfb9c62c422785ceb38:/terminal.c

diff --git a/terminal.c b/terminal.c
index 4d7a87dd..49c0ddf9 100644
--- a/terminal.c
+++ b/terminal.c
@@ -900,7 +900,7 @@ static int beep_overload = 0;
 		}
 		seen_disp_event = TRUE;
 		break;
-	      case '\177': /* Destructive backspace 
+	      case '\177': /* Destructive backspace
 			      This does nothing on a real VT100 */
 	        compatibility(OTHER);
 		if (curs_x && !wrapnext) curs_x--;
@@ -913,7 +913,7 @@ static int beep_overload = 0;
 	else switch (termstate) {
 	  case TOPLEVEL:
 	  /* Only graphic characters get this far, ctrls are stripped above */
-	    if (wrapnext) {
+	    if (wrapnext && wrap) {
 		cpos[1] |= ATTR_WRAPPED;
 		if (curs_y == marg_b)
 		    scroll (marg_t, marg_b, 1, TRUE);
@@ -959,7 +959,7 @@ static int beep_overload = 0;
 	    if (curs_x == cols) {
 		cpos--;
 		curs_x--;
-		wrapnext = wrap;
+		wrapnext = TRUE;
 	    }
 	    seen_disp_event = 1;
 	    break;