[[TIG][PATCH] 3/3] Revert "Scroll diff with arrow keys in log view"
- From
Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
- Date
- Aug 3, 2013, 00:23 UTC
- Message-ID
- <1375489399-11618-4-git-send-email-a.kumar@alumni.iitm.ac.in>
- In-Reply-To
- <1375489399-11618-1-git-send-email-a.kumar@alumni.iitm.ac.in>
This reverts commit 888611dd5d407775245d574a3dc5c01b5963a5ba. This is because, in the re-engineered log view, scrolling the log with the arrows now updates the diff in the diff view when the screen is split. This resembles the earlier behaviour, and is also what users of software like Mutt (which uses the pager view concept) would expect.
Signed-Off-By: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
Conflicts: tig.c --- tig.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tig.c b/tig.c index 53947b7..65c91a0 100644 --- a/tig.c +++ b/tig.c @@ -1901,7 +1901,6 @@ enum view_flag { VIEW_STDIN = 1 << 8, VIEW_SEND_CHILD_ENTER = 1 << 9, VIEW_FILE_FILTER = 1 << 10, - VIEW_NO_PARENT_NAV = 1 << 11, }; #define view_has_flags(view, flag) ((view)->ops->flags & (flag)) @@ -3774,7 +3773,7 @@ view_driver(struct view *view, enum request request) case REQ_NEXT: case REQ_PREVIOUS: - if (view->parent && !view_has_flags(view->parent, VIEW_NO_PARENT_NAV)) { + if (view->parent) { int line; view = view->parent; @@ -4498,7 +4497,7 @@ log_request(struct view *view, enum request request, struct line *line) static struct view_ops log_ops = { "line", { "log" }, - VIEW_ADD_PAGER_REFS | VIEW_OPEN_DIFF | VIEW_SEND_CHILD_ENTER | VIEW_NO_PARENT_NAV, + VIEW_ADD_PAGER_REFS | VIEW_OPEN_DIFF | VIEW_SEND_CHILD_ENTER, sizeof(struct log_state), log_open, pager_read,
-- 1.8.3.2