X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/2b42e5d686833a9f45020dfeb8148832d0ad30f7..d4d8de8fb345853df54a2b3f25a1c9824ee6dedb:/tig.c diff --git a/tig.c b/tig.c index 384fe21..66c5f76 100644 --- a/tig.c +++ b/tig.c @@ -565,6 +565,7 @@ LINE(TREE, "tree ", COLOR_BLUE, COLOR_DEFAULT, 0), \ LINE(AUTHOR, "author ", COLOR_CYAN, COLOR_DEFAULT, 0), \ LINE(COMMITTER, "committer ", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(SIGNOFF, " Signed-off-by", COLOR_YELLOW, COLOR_DEFAULT, 0), \ +LINE(ACKED, " Acked-by", COLOR_YELLOW, COLOR_DEFAULT, 0), \ LINE(DEFAULT, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(CURSOR, "", COLOR_WHITE, COLOR_GREEN, A_BOLD), \ LINE(STATUS, "", COLOR_GREEN, COLOR_DEFAULT, 0), \ @@ -1523,7 +1524,7 @@ scroll_view(struct view *view, enum request request) static void move_view(struct view *view, enum request request) { - bool scroll = FALSE; + int scroll_steps = 0; int steps; switch (request) { @@ -1573,19 +1574,18 @@ move_view(struct view *view, enum request request) /* Check whether the view needs to be scrolled */ if (view->lineno < view->offset || view->lineno >= view->offset + view->height) { + scroll_steps = steps; if (steps < 0 && -steps > view->offset) { - steps = -view->offset; + scroll_steps = -view->offset; } else if (steps > 0) { if (view->lineno == view->lines - 1 && view->lines > view->height) { - steps = view->lines - view->offset - 1; - if (steps >= view->height) - steps -= view->height - 1; + scroll_steps = view->lines - view->offset - 1; + if (scroll_steps >= view->height) + scroll_steps -= view->height - 1; } } - - scroll = TRUE; } if (!view_is_displayed(view)) { @@ -1598,8 +1598,8 @@ move_view(struct view *view, enum request request) if (ABS(steps) < view->height) draw_view_line(view, view->lineno - steps - view->offset); - if (scroll) { - do_scroll_view(view, steps); + if (scroll_steps) { + do_scroll_view(view, scroll_steps); return; }