1 files changed, 19 insertions, 3 deletions

diff --git a/form.c b/form.c
index 0eb0976a6a..5ae139d4af 100644
--- a/form.c
+++ b/form.c
@@ -104,6 +104,7 @@ int sp;
     CMD mycmd;
     STR *str;
     char *chophere;
+    int blank = TRUE;
 
     mycmd.c_type = C_NULL;
     orec->o_lines = 0;
@@ -114,10 +115,17 @@ int sp;
 	if (s = fcmd->f_pre) {
 	    while (*s) {
 		if (*s == '\n') {
-		    while (d > orec->o_str && (d[-1] == ' ' || d[-1] == '\t'))
-			d--;
+		    t = orec->o_str;
+		    if (blank && (fcmd->f_flags & FC_REPEAT)) {
+			while (d > t && (d[-1] != '\n'))
+			    d--;
+		    }
+		    else {
+			while (d > t && (d[-1] == ' ' || d[-1] == '\t'))
+			    d--;
+		    }
 		    if (fcmd->f_flags & FC_NOBLANK) {
-			if (d == orec->o_str || d[-1] == '\n') {
+			if (blank || d == orec->o_str || d[-1] == '\n') {
 			    orec->o_lines--;	/* don't print blank line */
 			    linebeg = fcmd->f_next;
 			    break;
@@ -129,6 +137,7 @@ int sp;
 		    }
 		    else
 			linebeg = fcmd->f_next;
+		    blank = TRUE;
 		}
 		*d++ = *s++;
 	    }
@@ -149,6 +158,8 @@ int sp;
 	    while (size && *s && *s != '\n') {
 		if (*s == '\t')
 		    *s = ' ';
+		else if (*s != ' ')
+		    blank = FALSE;
 		size--;
 		if (*s && index(chopset,(*d++ = *s++)))
 		    chophere = s;
@@ -201,6 +212,8 @@ int sp;
 	    while (size && *s && *s != '\n') {
 		if (*s == '\t')
 		    *s = ' ';
+		else if (*s != ' ')
+		    blank = FALSE;
 		size--;
 		if (*s && index(chopset,*s++))
 		    chophere = s;
@@ -245,6 +258,8 @@ int sp;
 	    while (size && *s && *s != '\n') {
 		if (*s == '\t')
 		    *s = ' ';
+		else if (*s != ' ')
+		    blank = FALSE;
 		size--;
 		if (*s && index(chopset,*s++))
 		    chophere = s;
@@ -318,6 +333,7 @@ int sp;
 		}
 		break;
 	    }
+	    blank = FALSE;
 	    value = str_gnum(str);
 	    if (fcmd->f_flags & FC_DP) {
 		sprintf(d, "%#*.*f", size, fcmd->f_decimals, value);