X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e65096f25904d6ac34414fb99d4ad62eb3fd823b..f98b826007692d62a286b12c0360617480828d02:/terminal.c

diff --git a/terminal.c b/terminal.c
index 0a03f3a2..65efb8eb 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1722,7 +1722,7 @@ void term_provide_resize_fn(Terminal *term,
 {
     term->resize_fn = resize_fn;
     term->resize_ctx = resize_ctx;
-    if (term->cols > 0 && term->rows > 0)
+    if (resize_fn && term->cols > 0 && term->rows > 0)
 	resize_fn(resize_ctx, term->cols, term->rows);
 }
 
@@ -2850,6 +2850,13 @@ static void term_out(Terminal *term)
 		term->wrapnext = FALSE;
 		seen_disp_event(term);
 		term->paste_hold = 0;
+
+        if (term->cfg.crhaslf) {  
+		  if (term->curs.y == term->marg_b)
+		    scroll(term, term->marg_t, term->marg_b, 1, TRUE);
+		  else if (term->curs.y < term->rows - 1)
+		    term->curs.y++;
+        }
 		if (term->logctx)
 		    logtraffic(term->logctx, (unsigned char) c, LGTYP_ASCII);
 		break;
@@ -6398,6 +6405,7 @@ char *term_get_ttymode(Terminal *term, const char *mode)
 	val = term->cfg.bksp_is_delete ? "^?" : "^H";
     }
     /* FIXME: perhaps we should set ONLCR based on cfg.lfhascr as well? */
+    /* FIXME: or ECHO and friends based on local echo state? */
     return dupstr(val);
 }
 
@@ -6441,7 +6449,7 @@ int term_get_userpass_input(Terminal *term, prompts_t *p,
 	 */
 	{
 	    int i;
-	    for (i = 0; i < p->n_prompts; i++)
+	    for (i = 0; i < (int)p->n_prompts; i++)
 		memset(p->prompts[i]->result, 0, p->prompts[i]->result_len);
 	}
     }