Mark all added/removed lines in column 0

Author: andebjor

doc/tigrc.5.adoc

@@ -275,10 +275,10 @@ The following variables can be set:
 	Hide the leading `+` and `-` signs in diff output. Copy-paste of lines
 	from the diff view may be aided by this option. Enabling this only makes
 	sense when coloring is used to distinguish added and removed lines.
-	Removed and added empty lines are indicated by a space highlighted by
-	the color `diff-add-highlight` or `diff-del-highlight`, respectively.
-	Keeping the `standout` (reverse) property set for these is suggested, as
-	white space is otherwise invisible. Off by default.
+	Removed and added lines are indicated in the first column by a space
+	highlighted by the color `diff-add-highlight` or `diff-del-highlight`,
+	respectively. Keeping the `standout` (reverse) property set for these is
+	suggested, as white space is otherwise invisible. Off by default.
 
 'diff-highlight' (mixed)::
 

src/draw.c

@@ -80,13 +80,15 @@ draw_chars(struct view *view, enum line_type type, const char *string, int lengt
 		    view->col == 0      &&
 		    (type == LINE_DIFF_ADD || type == LINE_DIFF_DEL)
 		   ) {
-			if (len == 1) { // highlight empty lines by the highlight propery
-				if (type == LINE_DIFF_ADD)
-					set_view_attr(view, LINE_DIFF_ADD_HIGHLIGHT);
-				else if (type == LINE_DIFF_DEL)
-					set_view_attr(view, LINE_DIFF_DEL_HIGHLIGHT);
-			}
+			/* Mark first column by color-only for add/del line */
+			if (type == LINE_DIFF_ADD)
+				set_view_attr(view, LINE_DIFF_ADD_HIGHLIGHT);
+			else if (type == LINE_DIFF_DEL)
+				set_view_attr(view, LINE_DIFF_DEL_HIGHLIGHT);
 			waddnstr(view->win, " ", 1);
+
+			/* Add the actual diff line */
+			set_view_attr(view, type);
 			waddnstr(view->win, string+1, len-1);
 		} else {
 			waddnstr(view->win, string, len);