From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: npostavs@users.sourceforge.net Newsgroups: gmane.emacs.bugs Subject: bug#25493: 26.0.50; ediff merge should (optionally) show ancestor in fourth window Date: Sat, 04 Mar 2017 18:06:50 -0500 Message-ID: <87fuisabg5.fsf@users.sourceforge.net> References: <874lzqe9tn.fsf@calancha-pc> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1488668777 2682 195.159.176.226 (4 Mar 2017 23:06:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 4 Mar 2017 23:06:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Cc: Philipp Stephani , 25493@debbugs.gnu.org To: Tino Calancha Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Mar 05 00:06:11 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckIkY-0007sn-Rt for geb-bug-gnu-emacs@m.gmane.org; Sun, 05 Mar 2017 00:06:07 +0100 Original-Received: from localhost ([::1]:36936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckIkd-0006C8-F4 for geb-bug-gnu-emacs@m.gmane.org; Sat, 04 Mar 2017 18:06:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckIkX-0006By-Mn for bug-gnu-emacs@gnu.org; Sat, 04 Mar 2017 18:06:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckIkU-0008QR-94 for bug-gnu-emacs@gnu.org; Sat, 04 Mar 2017 18:06:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:42168) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ckIkU-0008QM-0d for bug-gnu-emacs@gnu.org; Sat, 04 Mar 2017 18:06:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ckIkT-0003U4-PG for bug-gnu-emacs@gnu.org; Sat, 04 Mar 2017 18:06:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: npostavs@users.sourceforge.net Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 04 Mar 2017 23:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25493 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25493-submit@debbugs.gnu.org id=B25493.148866874313363 (code B ref 25493); Sat, 04 Mar 2017 23:06:01 +0000 Original-Received: (at 25493) by debbugs.gnu.org; 4 Mar 2017 23:05:43 +0000 Original-Received: from localhost ([127.0.0.1]:40367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckIkB-0003TT-9S for submit@debbugs.gnu.org; Sat, 04 Mar 2017 18:05:43 -0500 Original-Received: from mail-io0-f195.google.com ([209.85.223.195]:35532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ckIk9-0003TD-Bp for 25493@debbugs.gnu.org; Sat, 04 Mar 2017 18:05:41 -0500 Original-Received: by mail-io0-f195.google.com with SMTP id f103so10325521ioi.2 for <25493@debbugs.gnu.org>; Sat, 04 Mar 2017 15:05:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ToRjI681lF56ZabAS1bjGmKvRtg/7Mg+S9NCgoWzPHQ=; b=J05Wb5/Fuuip7vH9/gJY37O/2r8MIugptGTLWoOYk2ABKp30q2KVd3wz82AbjZ0ZHi S/XD/fCoXwzyYngNJvKaxzS2z7kWLJdIIrJ3gWyQzT1NwM8jPFh7/OcMOHsbbToRM2Gz BWhy2PehhZC3JOkaTzzJP+6dMDgr0fOitLIKDCwPdxdc8GuFbzFdej1wKKasSICEzmfT pSFINFzQD4WorbInQ1JbNowNR8s+cVftVvm4i1ZkbUjSDYCZNGi2263oiqPY1qB4LQly 1DFD/woBf2ejiJVSWkmf+cjmosbNu9CFadHgBU2XldebjZmOXPK3fNlDV7g1r1yCpQF0 L9pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=ToRjI681lF56ZabAS1bjGmKvRtg/7Mg+S9NCgoWzPHQ=; b=dqdDwzap5uwZ597AtzJu2n6mc//WqLo6IuFp7NMSW14jgfkcgt/NhZJw/I8K1r9BiU wvcPG3/u6mfja4g3iKrXOxiox056qURUnekFwjrKEFRlOozJitGeLbusLL4FgjxgxU7Z gBqkkYLb7Aas+V9XY9DYMjSvsZv5LI6KBoYyZ766IshmHWAf+ja+mFjAj5fK06SQJnaM o18Ve4Hm2SdJLE8kgazukDU4WLGx2KIoNGZRhjS6sAwepVSAWRU/DlehPXQG0BW11O2c KhXIdRpA5aVE0KyekeEsEOUQcg3GD2g4SJ35X5F+G3RPGxx/PB3PweXKCiVxlR20pA4w 331g== X-Gm-Message-State: AMke39mzIjxseM5pA69flRSm5/CJotNhtYPAAowu/PkerKAxhZUJnrUrDhbLULWxAz1ecw== X-Received: by 10.107.24.197 with SMTP id 188mr9838660ioy.151.1488668735849; Sat, 04 Mar 2017 15:05:35 -0800 (PST) Original-Received: from zony ([45.2.7.65]) by smtp.googlemail.com with ESMTPSA id j14sm3747610itd.0.2017.03.04.15.05.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 04 Mar 2017 15:05:35 -0800 (PST) In-Reply-To: <874lzqe9tn.fsf@calancha-pc> (Tino Calancha's message of "Sun, 19 Feb 2017 19:47:32 +0900") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:130200 Archived-At: Tino Calancha writes: > Philipp Stephani writes: > >> It would be very useful if ediff merge could optionally display the >> ancestor in a fourth window, like vimdiff or meld. See >> https://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00204.html. > > Following patch, by default, display the ancestor buffer and auto refine > it in 3way merges. > This feature can be disabled by customizing a new option. Could you perhaps explain more in the commit messages about how the patch works, at a high level? It's long enough that I get lost while reading it. As a user, I noticed that `ediff-scroll-vertically' doesn't scroll the ancestor buffer. Also, I want diff refining in buffer A and B against the ancestor, not each other. This might be more of an addtional feature request that doesn't necessarily need to addressed in your patch though. > Subject: [PATCH 1/3] Show ancestor buffer in 3way merges > > Add an option to control if the ancestor buffer must > be shown in 3way merges (Bug#25493). > Add an option to control whether if show or ignore diffs with ^^ s/if/to/ I think? > > +(defsubst ediff--check-ancestor-exists () I don't think there is reason for this to be a defsubst over a defun. > + > +(defun ediff-toggle-show-ancestor () > + (when (eq ediff-show-ancestor > + (alist-get 'ediff-show-ancestor alist)) > + (assq-delete-all 'ediff-show-ancestor alist) I think this should be (setq alist (assq-delete-all ...)) or equivalently (cl-callf assq-delete-all alist 'ediff-show-ancestor) > +(defun ediff-toggle-hide-equal-diffs-with-ancestor () > + (when (eq ediff-hide-equal-diffs-with-ancestor > + (alist-get 'ediff-hide-equal-diffs-with-ancestor > + alist)) > + (assq-delete-all 'ediff-hide-equal-diffs-with-ancestor > + alist) Again here.