~mdw
/
tig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with master
[tig]
/
tig.c
diff --git
a/tig.c
b/tig.c
index
0f77167
..
b827a92
100644
(file)
--- a/
tig.c
+++ b/
tig.c
@@
-418,7
+418,7
@@
parse_options(int argc, char *argv[])
if (opt[0] && opt[0] != '-')
break;
if (opt[0] && opt[0] != '-')
break;
- die("unknown
command '%s'", opt
);
+ die("unknown
option '%s'\n\n%s", opt, usage
);
}
if (!isatty(STDIN_FILENO)) {
}
if (!isatty(STDIN_FILENO)) {
@@
-867,8
+867,9
@@
update_view_title(struct view *view)
wprintw(view->title, "[%s]", view->name);
if (view->lines || view->pipe) {
wprintw(view->title, "[%s]", view->name);
if (view->lines || view->pipe) {
+ unsigned int view_lines = view->offset + view->height;
unsigned int lines = view->lines
unsigned int lines = view->lines
- ?
(view->lineno + 1
) * 100 / view->lines
+ ?
MIN(view_lines, view->lines
) * 100 / view->lines
: 0;
wprintw(view->title, " - %s %d of %d (%d%%)",
: 0;
wprintw(view->title, " - %s %d of %d (%d%%)",