diff --git a/ChangeLog b/ChangeLog
index a5c0a5e5..a94017d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,8 @@ CVS code -
 	- gettextized a pair of strings.
   bottombars()
 	- Get rid of that annoying reversed line when color is on! :)
+  edit_add()
+	- Little fixes to let color highlights not bleed onto the next line.
 - m4/gettext.m4:
 	- Back down to 1.1.3 version.
 - faq.html:
diff --git a/winio.c b/winio.c
index 7c56f06d..d1371ada 100644
--- a/winio.c
+++ b/winio.c
@@ -804,12 +804,10 @@ void edit_add(filestruct * fileptr, int yval, int start, int virt_cur_x,
 			    wattron(edit, A_BOLD);
 			wattron(edit, COLOR_PAIR(tmpcolor->pairnum));
 
-			if (regmatches[0].rm_eo - regmatches[0].rm_so 
-			    + k <= COLS)
+			if (regmatches[0].rm_eo + k <= COLS)
 			    paintlen = regmatches[0].rm_eo - regmatches[0].rm_so;
 			else
-			    paintlen = COLS - (regmatches[0].rm_eo 
-					-  regmatches[0].rm_so);
+			    paintlen = COLS - k - regmatches[0].rm_so - 1;
 
 			mvwaddnstr(edit, yval, regmatches[0].rm_so + k,
 			    &fileptr->data[k + regmatches[0].rm_so],