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: Mon, 27 Feb 2017 23:42:58 -0500 Message-ID: <871sujdiy5.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 1488256933 9530 195.159.176.226 (28 Feb 2017 04:42:13 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 28 Feb 2017 04:42:13 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Cc: Philipp Stephani , "Charles A. Roelli" , 25493@debbugs.gnu.org To: Tino Calancha Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 28 05:42:07 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 1ciZby-0001h1-SI for geb-bug-gnu-emacs@m.gmane.org; Tue, 28 Feb 2017 05:42:07 +0100 Original-Received: from localhost ([::1]:58576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciZc3-0001f5-Bm for geb-bug-gnu-emacs@m.gmane.org; Mon, 27 Feb 2017 23:42:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciZbx-0001eu-Rh for bug-gnu-emacs@gnu.org; Mon, 27 Feb 2017 23:42:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciZbu-0000k3-Qn for bug-gnu-emacs@gnu.org; Mon, 27 Feb 2017 23:42:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ciZbu-0000jz-NJ for bug-gnu-emacs@gnu.org; Mon, 27 Feb 2017 23:42:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ciZbu-0001y4-Eo for bug-gnu-emacs@gnu.org; Mon, 27 Feb 2017 23:42: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: Tue, 28 Feb 2017 04:42: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.14882569137548 (code B ref 25493); Tue, 28 Feb 2017 04:42:02 +0000 Original-Received: (at 25493) by debbugs.gnu.org; 28 Feb 2017 04:41:53 +0000 Original-Received: from localhost ([127.0.0.1]:58921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciZbl-0001xf-Gh for submit@debbugs.gnu.org; Mon, 27 Feb 2017 23:41:53 -0500 Original-Received: from mail-io0-f196.google.com ([209.85.223.196]:36620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ciZbk-0001xS-9F for 25493@debbugs.gnu.org; Mon, 27 Feb 2017 23:41:52 -0500 Original-Received: by mail-io0-f196.google.com with SMTP id w10so392118iod.3 for <25493@debbugs.gnu.org>; Mon, 27 Feb 2017 20:41:52 -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=EocxorSeR+zyiRf70cCSIooeA3kz9JbaISaYfd6DHzs=; b=ie0hUetvhcysy9W0yQF4Q5cUFITlYSgxwd3kL/aUeorYVeXO/4J6g81Yq2h2eJIoI1 Ofuy3Gbmv0NnUH9s4qgn4X0PfsScd8z3EZIkWg1sNxGJtayJqrhoE7/44kuf3AC2Sxgl QO1I96Qr30D4o6Wa4UgfUetyIr1eXikbuu09CGFl1dyfFo8ayFMjWs/jCEG2LuwHi7GS Tylnkhrn+LQ6YLAj7VjFc+gkVi2FWiEoGWvBYq2JSTTG9+ZQxrBcPnzoc0v0EYhPfrec DQBoVb1IIOTcxhMX8JDnxI1FcmczvEwp9iy+F4FeotOr6jhXOr75CvhMXGzN3AOW02VV jw+Q== 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=EocxorSeR+zyiRf70cCSIooeA3kz9JbaISaYfd6DHzs=; b=D07WfOlZQBEFZTce2nslNDI8K03d0sGMk4Z7Ds7tr9/+U1QJ6B3JShWGFSSfBJvrrK N54jwv/oJ32UrbOgjYsbZwa5T8RcPPmJXM+dgiP38VnjLx89Gz49rDXrm0oJhzigeNkD LHb7jIXCTT1UmGkUHLetvQZ/hk80n48lllsGeE5OIExFTqP55P7Vp9oI7dgBSk7rft5D t9FqnfD3RdkQljuR1GXELtuySaBdPk9FqJIeEXZfhTLFoIKD0SjXUwUBru8FsAFv/mtn EWWZrwxCHcGmYWELPzFppGUm9KktY0e03GFM6dpGUpDnKeR8+P4Kj0aJj/F3kljSyoKl hMPQ== X-Gm-Message-State: AMke39nSlYM1JcYbhVSEvgbjNyEdCuSF/0gD+asSS09AncQXBuxxU7SV2wnOYkOl7AqpVw== X-Received: by 10.107.63.196 with SMTP id m187mr750182ioa.149.1488256906771; Mon, 27 Feb 2017 20:41:46 -0800 (PST) Original-Received: from zony ([45.2.7.65]) by smtp.googlemail.com with ESMTPSA id d5sm6136389itd.3.2017.02.27.20.41.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2017 20:41:46 -0800 (PST) In-Reply-To: (Tino Calancha's message of "Tue, 28 Feb 2017 12:55:27 +0900 (JST)") 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:129921 Archived-At: Tino Calancha writes: > On Sun, 26 Feb 2017, Charles A. Roelli wrote: > >> Wow, well done. Has this been committed yet? > No yet. I am waiting for aproval. > People must be busy preparing the Emacs 25.2 release. It's a big patch, I haven't had time to digest the whole thing yet, but I'm wondering about why do we need both "\ show/hide ancestor" and "/ -show ancestor buff"? ~ -swap variants | s -shrink window C | / -show ancestor buff | $$ -show clashes only | & -merge w/new default | $* -skip changed regions | + | $% -all ancestor diffs | + | \\ -show/hide ancestor |