Commit Diff

Commit:
5c3a0a1a77196a588cb572b326aef1eb4fb23fb3
From:
Mark Jamsek <mark@jamsek.dev>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
fix OB1 in tog ref and tree views causing wrapped lines While here, draw to the last column in tog help. ok op@ and stsp@
Actions:
Patch | Tree
commit - 117f997e6fe54136bfe028caf8038560a071451c
commit + 5c3a0a1a77196a588cb572b326aef1eb4fb23fb3
blob - ca4b32aa5e3ae11946ad03de15bb435c4f3aceca
blob + 6d8d3e63b5b6044a222ed9586b1638c36fad2a57
--- tog/tog.c
+++ tog/tog.c
@@ -6926,7 +6926,7 @@ draw_tree_entries(struct tog_view *view, const char *p
 		if (tc)
 			wattr_off(view->window,
 			    COLOR_PAIR(tc->colorpair), NULL);
-		if (width < view->ncols - 1)
+		if (width < view->ncols)
 			waddch(view->window, '\n');
 		if (n == s->selected && view->focussed)
 			wstandend(view->window);
@@ -8188,7 +8188,7 @@ show_ref_view(struct tog_view *view)
 		if (tc)
 			wattr_off(view->window,
 			    COLOR_PAIR(tc->colorpair), NULL);
-		if (width < view->ncols - 1)
+		if (width < view->ncols)
 			waddch(view->window, '\n');
 		if (n == s->selected && view->focussed)
 			wstandend(view->window);
@@ -8834,22 +8834,20 @@ show_help_view(struct tog_view *view)
 			int skip;
 
 			err = format_line(&wline, &width, &skip, line,
-			    view->x, view->ncols - 1, 0, view->x ? 1 : 0);
+			    view->x, view->ncols, 0, view->x ? 1 : 0);
 			if (err) {
 				free(line);
 				return err;
 			}
-			rc = waddwstr(view->window, &wline[skip]);
+			waddwstr(view->window, &wline[skip]);
 			free(wline);
 			wline = NULL;
-			if (rc == ERR)
-				return got_error_msg(GOT_ERR_IO, "waddwstr");
 		}
 		if (s->lineno == view->hiline) {
 			while (width++ < view->ncols)
 				waddch(view->window, ' ');
 		} else {
-			if (width <= view->ncols)
+			if (width < view->ncols)
 				waddch(view->window, '\n');
 		}
 		if (attr)