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, 28 Feb 2017 15:39:57 +0900 (JST) Message-ID: References: <874lzqe9tn.fsf@calancha-pc> <871sujdiy5.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Trace: blaine.gmane.org 1488264081 8235 195.159.176.226 (28 Feb 2017 06:41:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 28 Feb 2017 06:41:21 +0000 (UTC) User-Agent: Alpine 2.20 (DEB 67 2015-01-07) Cc: Philipp Stephani , "Charles A. Roelli" , 25493@debbugs.gnu.org, Tino Calancha To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Feb 28 07:41:15 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 1cibTE-0000cI-O8 for geb-bug-gnu-emacs@m.gmane.org; Tue, 28 Feb 2017 07:41:12 +0100 Original-Received: from localhost ([::1]:58927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cibTE-0001Ji-K1 for geb-bug-gnu-emacs@m.gmane.org; Tue, 28 Feb 2017 01:41:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cibT8-0001Ja-Pa for bug-gnu-emacs@gnu.org; Tue, 28 Feb 2017 01:41:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cibT3-0002Py-TM for bug-gnu-emacs@gnu.org; Tue, 28 Feb 2017 01:41:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:60767) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cibT3-0002Pr-Qg for bug-gnu-emacs@gnu.org; Tue, 28 Feb 2017 01:41:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cibT3-0006aJ-Kc for bug-gnu-emacs@gnu.org; Tue, 28 Feb 2017 01:41:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 28 Feb 2017 06:41: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.148826401025242 (code B ref 25493); Tue, 28 Feb 2017 06:41:01 +0000 Original-Received: (at 25493) by debbugs.gnu.org; 28 Feb 2017 06:40:10 +0000 Original-Received: from localhost ([127.0.0.1]:58966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cibSE-0006Z3-GN for submit@debbugs.gnu.org; Tue, 28 Feb 2017 01:40:10 -0500 Original-Received: from mail-pg0-f67.google.com ([74.125.83.67]:33643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cibSA-0006YS-Hr for 25493@debbugs.gnu.org; Tue, 28 Feb 2017 01:40:08 -0500 Original-Received: by mail-pg0-f67.google.com with SMTP id x17so527382pgi.0 for <25493@debbugs.gnu.org>; Mon, 27 Feb 2017 22:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=nbZ7SJlLPf12vMdsjVanjp/qkrM23qB+HHTiBYdZK+8=; b=goTeNP7EWvieZJiwrsouqbfyESzoiiaMYR73GemlPGAuKFkjyM5ax9s+HF5BVSILfc 5IO7oogT2mc1LXywglB0dhJ0UOXWEl5AuwYim4shsbQ1VMRrNRHc6pHiTmfWg3j7zlcE thBvGiMkJT5MITNl3jxA2UjwHeXzjqu1XfMW5JFd9Zc6PadkGNq4atovKVUzciHOO4rR Rpl8a5aAAEtx9groBQY3SOvDBTLr3ghnDRoRXFW9fs6E6eULmXw3+bUtemIuHTbM4cPI Z4i0hsaszuXRAlET/E1ljrNHNp1BDhEBHfs8VxrxVzbGYM/nxlXOzrq8Gd8al0qD8K1g YmhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=nbZ7SJlLPf12vMdsjVanjp/qkrM23qB+HHTiBYdZK+8=; b=eZDASDL9K8QnSR8SA5w1Nq6O4FBr+dQ1KTDr4Mk1IHgsHj/NkXtJIfbtT/m3acpRQq G3f1y+u7GSnWAvYE3iPjy0TlllgXL8LTt6yXUjPV97mfKOUvOhePFpxaBopJ1uTYWcxj RrYhqW2LRQC70+hTp43k4agSUL1HsuCDJM1uWwWGjcdR7GcpgbQZPR9UGZhvK+6hRRJY 0ZlylZCOhwXzHGVTJAmE6zH0OXyqkEK01MkKhdhamtfpd1BrJvGuhjxYBeKfJ5VUW3n6 z93JNqlgCST85zBYd9qEbsH20lNLP0M2P4fcwNohyfckFq8zPrp7Fcdz7Rp0jot+URHM e/wg== X-Gm-Message-State: AMke39lBJnMbgfOUY1tQ64aW28NC8+9q/G5TwqDbSEebYCdIWVCs14IG8FRn5h24gV0m5g== X-Received: by 10.99.36.7 with SMTP id k7mr840358pgk.201.1488264000873; Mon, 27 Feb 2017 22:40:00 -0800 (PST) Original-Received: from calancha-pc (104.81.147.124.dy.bbexcite.jp. [124.147.81.104]) by smtp.gmail.com with ESMTPSA id l3sm1638984pgn.10.2017.02.27.22.39.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Feb 2017 22:40:00 -0800 (PST) X-Google-Original-From: Tino Calancha X-X-Sender: calancha@calancha-pc In-Reply-To: <871sujdiy5.fsf@users.sourceforge.net> 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:129925 Archived-At: On Mon, 27 Feb 2017, npostavs@users.sourceforge.net wrote: > 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, Thanks for look on it. Please, take your time. > 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 | Yeah, it's weird. I though about that. Probably we just need the toggle show/hide; we might use for it the original key binding for show ancestor. In first iteration i wanted just to provide the new feature and let people suggest if something must be drop/supersed.