From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kumar Appaiah Subject: [[TIG][PATCH v2] 3/3] Revert "Scroll diff with arrow keys in log view" Date: Tue, 06 Aug 2013 00:58:21 -0400 Message-ID: <1375765101-31461-4-git-send-email-a.kumar@alumni.iitm.ac.in> References: <1375765101-31461-1-git-send-email-a.kumar@alumni.iitm.ac.in> Content-Transfer-Encoding: 7BIT Cc: Kumar Appaiah To: fonseca@diku.dk, git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 06 06:58:41 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1V6ZLy-0005xw-F3 for gcvg-git-2@plane.gmane.org; Tue, 06 Aug 2013 06:58:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751779Ab3HFE6Z (ORCPT ); Tue, 6 Aug 2013 00:58:25 -0400 Received: from mta6.srv.hcvlny.cv.net ([167.206.4.212]:37332 "EHLO mta6.srv.hcvlny.cv.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396Ab3HFE6Y (ORCPT ); Tue, 6 Aug 2013 00:58:24 -0400 Received: from odessa (ool-18bb429a.dyn.optonline.net [24.187.66.154]) by mta6.srv.hcvlny.cv.net (Sun Java System Messaging Server 6.2-9.20 (built Jul 15 2010)) with ESMTPA id <0MR3002WGF5BFJR0@mta6.srv.hcvlny.cv.net> for git@vger.kernel.org; Tue, 06 Aug 2013 00:58:24 -0400 (EDT) Received: from kumar by odessa with local (Exim 4.80) (envelope-from ) id 1V6ZLj-0008Eo-3S; Tue, 06 Aug 2013 00:58:23 -0400 In-reply-to: <1375765101-31461-1-git-send-email-a.kumar@alumni.iitm.ac.in> X-Mailer: git-send-email 1.8.3.2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 Conflicts: tig.c --- tig.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tig.c b/tig.c index 256b589..5f564a5 100644 --- a/tig.c +++ b/tig.c @@ -1905,7 +1905,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)) @@ -3773,7 +3772,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; @@ -4490,7 +4489,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