From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#25493: 26.0.50; ediff merge should (optionally) show ancestor in fourth window Date: Tue, 14 Mar 2017 16:43:38 +0900 Message-ID: <87k27sfglx.fsf@gmail.com> References: <874lzqe9tn.fsf@calancha-pc> <87fuisabg5.fsf@users.sourceforge.net> <87innmh53f.fsf@calancha-pc> <87efy47wqj.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1489477456 1794 195.159.176.226 (14 Mar 2017 07:44:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 14 Mar 2017 07:44:16 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) To: 25493-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 14 08:44:09 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 1cnh7n-00088Q-PF for geb-bug-gnu-emacs@m.gmane.org; Tue, 14 Mar 2017 08:44:08 +0100 Original-Received: from localhost ([::1]:56872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnh7t-0007zB-Hs for geb-bug-gnu-emacs@m.gmane.org; Tue, 14 Mar 2017 03:44:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnh7n-0007yB-3w for bug-gnu-emacs@gnu.org; Tue, 14 Mar 2017 03:44:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnh7i-0004sD-7T for bug-gnu-emacs@gnu.org; Tue, 14 Mar 2017 03:44:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56492) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cnh7i-0004s3-3r for bug-gnu-emacs@gnu.org; Tue, 14 Mar 2017 03:44:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cnh7h-0007gj-UJ for bug-gnu-emacs@gnu.org; Tue, 14 Mar 2017 03:44:01 -0400 Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Tue, 14 Mar 2017 07:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 25493 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 25493@debbugs.gnu.org, tino.calancha@gmail.com, p.stephani2@gmail.com Original-Received: via spool by 25493-done@debbugs.gnu.org id=D25493.148947743129525 (code D ref 25493); Tue, 14 Mar 2017 07:44:01 +0000 Original-Received: (at 25493-done) by debbugs.gnu.org; 14 Mar 2017 07:43:51 +0000 Original-Received: from localhost ([127.0.0.1]:54689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnh7W-0007g9-QD for submit@debbugs.gnu.org; Tue, 14 Mar 2017 03:43:51 -0400 Original-Received: from mail-pg0-f67.google.com ([74.125.83.67]:36801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cnh7V-0007fv-5m for 25493-done@debbugs.gnu.org; Tue, 14 Mar 2017 03:43:49 -0400 Original-Received: by mail-pg0-f67.google.com with SMTP id 25so22708587pgy.3 for <25493-done@debbugs.gnu.org>; Tue, 14 Mar 2017 00:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=hOrntg0RDUtsUu4OLNQh4WlUMPoe+7NJBkdXzlg+2gA=; b=BZLSD9MtSwRGjVi7fYasNcWv1FvUQsDg5VjcSPQs3XP8lhtVK4zntzz0WXn7xQ7zuE QcfP1Jf67kru8sag1XWxdyWAgdLmR49DKYIgYdvDsRT+xVFTABGMYMJ7qMjitUNR492j s5Bkk1zDFCxtRtVaOMxv43j++2qZnvM+MP9bVawohsLl442Tl7JSxhYBaDCJ3uD61stO qoUGNIQbASIKE5cIn+dCDBCOJFpfixZ5B9hgzJ05F8BR8vzjW2yjTg+avNq+02kCSHE7 FmTyjrM0SKpK+FAtIjAFjOn7zpM2UL7CU0XIsZdC2cn5rkFNnP1yRpwDdxSJ61p99Nvk P0ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=hOrntg0RDUtsUu4OLNQh4WlUMPoe+7NJBkdXzlg+2gA=; b=rcKWu736wA6wpJUnJ0odQYphdDrej8TAD4BwYVwy2j6tn8SR7z4hV0oQWeCspUJEIR RnMR9UxdyjpxhMIAVFmSg/ms0xYWus0ur7B2gbyzATI0WO08lfGSXqw2WNdvbkkmTTD9 HCRMKawOV7pdqpYo4EynOO9cxo6CYYzA1FGQH7BGtNyskWcdH3asEhjsILzgbu4WZqxb q36URk1ndK2uV42Wwg9qx14wMv5HvNgQ0YF6XDRyJC480faF903GhJ6LPNkFB0qze9VC jdRN7eiWMBRCVW3hpmrh2PMY0HQxo43CFwtn/gAWRukTJfZrVq1s4CiQ+tlgpIsktl/W Sjkw== X-Gm-Message-State: AMke39la93dQ4M2iG/hZt9vDG5zL7PbNtJHvTAvXz4zNKZ6A+wwYLmYrM5XQ/VzxnEjupA== X-Received: by 10.99.37.199 with SMTP id l190mr41368612pgl.86.1489477423209; Tue, 14 Mar 2017 00:43:43 -0700 (PDT) Original-Received: from calancha-pc (161.224.128.101.dy.bbexcite.jp. [101.128.224.161]) by smtp.gmail.com with ESMTPSA id p66sm36587617pfb.88.2017.03.14.00.43.41 for <25493-done@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Mar 2017 00:43:42 -0700 (PDT) In-Reply-To: <87efy47wqj.fsf@users.sourceforge.net> (npostavs@users.sourceforge.net's message of "Sat, 11 Mar 2017 08:45:40 -0500") 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:130568 Archived-At: npostavs@users.sourceforge.net writes: >> 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. Thanks. >> - >> - ;; 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? Now I mention that this trick is not necessary. Before the patch there were several parts of the code executed only if `ediff-3way-comparison-job' was non-nil. After the patch, those parts of the code also test if `ediff-merge-with-ancestor-job' is non-nil; that's why we don't need to fool it anymore. > Otherwise looks good to me. Thank you. Pushed to master as commit 0f3d1b782353fd1fc0ab5f89d47d9e790f44e6b2