diff --git a/src/nano.c b/src/nano.c
index c6bbb451..d8217002 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2516,8 +2516,8 @@ int do_justify(int full_justify)
 			next_line_len - indent_len + 1);
 		    strcpy(current->next->data + indent_len,
 			current->data + break_pos + 1);
-		    current->next->data[indent_len + line_len - break_pos - 1]
-			= ' ';
+		    current->next->data[indent_len + line_len -
+			break_pos - 1] = ' ';
 #ifndef NANO_SMALL
 		    if (mark_beginbuf == current->next) {
 			if (mark_beginx < indent_len)
diff --git a/src/winio.c b/src/winio.c
index 1fd95d30..a01a91c9 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -2338,7 +2338,8 @@ void edit_add(const filestruct *fileptr, const char *converted, int
 		 * starts. */
 		end_line = fileptr;
 		while (end_line != NULL &&
-			regexec(tmpcolor->end, end_line->data, 1, &endmatch, 0))
+			regexec(tmpcolor->end, end_line->data, 1,
+			&endmatch, 0) == REG_NOMATCH)
 		    end_line = end_line->next;
 
 		/* No end found, or it is too early. */