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, 11 Mar 2017 08:45:40 -0500 Message-ID: <87efy47wqj.fsf@users.sourceforge.net> References: <874lzqe9tn.fsf@calancha-pc> <87fuisabg5.fsf@users.sourceforge.net> <87innmh53f.fsf@calancha-pc> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1489239917 10351 195.159.176.226 (11 Mar 2017 13:45:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 11 Mar 2017 13:45: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 Sat Mar 11 14:45:12 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 1cmhKT-0001Sy-FC for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 Mar 2017 14:45:05 +0100 Original-Received: from localhost ([::1]:43489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmhKZ-00084f-Br for geb-bug-gnu-emacs@m.gmane.org; Sat, 11 Mar 2017 08:45:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cmhKT-00083W-Oe for bug-gnu-emacs@gnu.org; Sat, 11 Mar 2017 08:45:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cmhKQ-0003ng-MC for bug-gnu-emacs@gnu.org; Sat, 11 Mar 2017 08:45:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:52182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cmhKQ-0003na-Hl for bug-gnu-emacs@gnu.org; Sat, 11 Mar 2017 08:45:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cmhKQ-0003L9-8u for bug-gnu-emacs@gnu.org; Sat, 11 Mar 2017 08:45:02 -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, 11 Mar 2017 13:45:02 +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.148923987212783 (code B ref 25493); Sat, 11 Mar 2017 13:45:02 +0000 Original-Received: (at 25493) by debbugs.gnu.org; 11 Mar 2017 13:44:32 +0000 Original-Received: from localhost ([127.0.0.1]:50381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmhJv-0003K7-Tf for submit@debbugs.gnu.org; Sat, 11 Mar 2017 08:44:32 -0500 Original-Received: from mail-io0-f196.google.com ([209.85.223.196]:36490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cmhJt-0003Jr-MZ for 25493@debbugs.gnu.org; Sat, 11 Mar 2017 08:44:29 -0500 Original-Received: by mail-io0-f196.google.com with SMTP id 68so9406986ioh.3 for <25493@debbugs.gnu.org>; Sat, 11 Mar 2017 05:44:29 -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=T556tkf516p5L5Std2155DFQPt2q9LhmK9VSEm+3nfg=; b=ADCJHHSzp7vPBXRy+3pT65Ao2AD7SuVmcyjDIg7tx9lAh9nE9jUAQMDJbS7efTSRwq 4o7nLabat14jk6Vlgq12DmQ0KFaARC+xjIqSv3RaFlfZlqn1mENJyUahkyeVOx/iOCsD 3+K59U8BmNQg+LsY5KkCR7+ukyxtzEvPSW/aQYVtTuekvPSbbr18ctLxVScOxBz3TKWY hUiu4rNCCMmX/OyvDydOryaurePuPOqe8ACNnvaOhAif3365zzRhrJQ8saA5RkR3tpRC 8zYBeWhOWzHGCoakK0Ia5vIf+7dPeF20JBXwIl+A6K+F6K84j/zZcPRmLfROBmrzOvNK FBCA== 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=T556tkf516p5L5Std2155DFQPt2q9LhmK9VSEm+3nfg=; b=APNbR/BTplgdNDthZVovrc6ut+Nm7AgFA3L37iN42YK5n+vno9YBEXfaA1XnK+7Dnt h19iipAyaWQBTzdbjfXvomfqMbzIesFiTm3wRyvKv4UkL/wn5CaPbNoqJdNEf0g9rjA8 KWKthEZE2oEuD8iNElasqQVeuxFmoSdnneZl9d6uBr0AwR6U2Qf/Pfod+SQhEcjwaCGK /lk6QVayLAy+Q3PbFYRT8k9bYPwjRGhDKb6112l8Ma3zAPsJE5lV98LAOLJ1SCIte/Ij YLshhaGJhSF9GlzWT+7HsDmyb5PFp/h/K98wyl5n5X0g8P7W4UC4or5ZRNa9ivuGJgOj pLoQ== X-Gm-Message-State: AMke39kabUWJfagk/ZGO5dVg1mZD7d+SHX9d/4fc6W36JNpFsnXoHf0ucpL4ITxklS9Zaw== X-Received: by 10.107.31.11 with SMTP id f11mr24027090iof.183.1489239864189; Sat, 11 Mar 2017 05:44:24 -0800 (PST) Original-Received: from zony ([45.2.7.65]) by smtp.googlemail.com with ESMTPSA id j14sm1502461itd.0.2017.03.11.05.44.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Mar 2017 05:44:23 -0800 (PST) In-Reply-To: <87innmh53f.fsf@calancha-pc> (Tino Calancha's message of "Mon, 06 Mar 2017 23:06:44 +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:130484 Archived-At: Tino Calancha writes: > OK. I have simplified the patch a lot. I have restricted to the problem > in hands: to show the buffer ancestor in 3way merges. The refinement of > this buffer must keep in the TODO list (see below). Thanks, it's a lot more comprehensible now. > Subject: [PATCH 2/2] Show ancestor buffer in 3way merges > > Add an option ediff-show-ancestor', to control if the ancestor buffer > must be shown in 3way merges (Bug#25493); set it non-nil by default. ^^ Extra space there. > - > - ;; In case of merge job, fool it into thinking that it is just doing > - ;; comparison > - (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function) > - (ediff-3way-comparison-job ediff-3way-comparison-job) > - (ediff-merge-job ediff-merge-job) > - (ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job) > - (ediff-job-name ediff-job-name)) > - (if ediff-merge-job > - (setq ediff-setup-diff-regions-function 'ediff-setup-diff-regions3 > - ediff-3way-comparison-job t > - ediff-merge-job nil > - ediff-merge-with-ancestor-job nil > - ediff-job-name 'ediff-files3)) > - (funcall ediff-setup-diff-regions-function file-A file-B file-C)) > - > + (funcall ediff-setup-diff-regions-function file-A file-B > + (if ediff-merge-with-ancestor-job file-Ancestor file-C)) It works when I tested it, so I guess this is correct, but it's not really obvious to me why (i.e., why we no longer need to "fool it"). Could you add an explanation to the commit message? Otherwise looks good to me.