From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#11320: [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when merging with an ancestor Date: Thu, 28 Jun 2018 22:13:10 -0400 Message-ID: <87bmbunxvt.fsf@gmail.com> References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-3-git-send-email-dave@boostpro.com> <87d0y1ljfr.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1530238334 32366 195.159.176.226 (29 Jun 2018 02:12:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 29 Jun 2018 02:12:14 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) Cc: 11320@debbugs.gnu.org To: Dave Abrahams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jun 29 04:12:09 2018 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 1fYitN-0008Ip-32 for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Jun 2018 04:12:09 +0200 Original-Received: from localhost ([::1]:39495 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYivS-0005zj-Qe for geb-bug-gnu-emacs@m.gmane.org; Thu, 28 Jun 2018 22:14:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYivI-0005yv-3r for bug-gnu-emacs@gnu.org; Thu, 28 Jun 2018 22:14:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYivC-0006q4-Re for bug-gnu-emacs@gnu.org; Thu, 28 Jun 2018 22:14:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:59421) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYivC-0006pM-Of for bug-gnu-emacs@gnu.org; Thu, 28 Jun 2018 22:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fYivC-0004ri-GU for bug-gnu-emacs@gnu.org; Thu, 28 Jun 2018 22:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 29 Jun 2018 02:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11320 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 11320-submit@debbugs.gnu.org id=B11320.153023840118646 (code B ref 11320); Fri, 29 Jun 2018 02:14:02 +0000 Original-Received: (at 11320) by debbugs.gnu.org; 29 Jun 2018 02:13:21 +0000 Original-Received: from localhost ([127.0.0.1]:39085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fYiuW-0004qb-PD for submit@debbugs.gnu.org; Thu, 28 Jun 2018 22:13:20 -0400 Original-Received: from mail-it0-f65.google.com ([209.85.214.65]:56190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fYiuU-0004qI-8g; Thu, 28 Jun 2018 22:13:18 -0400 Original-Received: by mail-it0-f65.google.com with SMTP id 16-v6so744506itl.5; Thu, 28 Jun 2018 19:13:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=kQFafvbfWAYAEgtbd0UC35B3zHihsGxxureC6e7VIJQ=; b=AX7UNz8vIPc4BIUguRLhqOzi8GVycSMRMLXbgBMY7aqRgspZBGqtAIJ+2R7VzQfJwk +ajC4E+1glISci+o846r3GNlKttgxNA/8EgEipmYn2YsIUdNid9T0uXCe7CHVX7T3QFX CwUEuwmIRlu3dwhkUHZ8Ftww46xAfMegd00eok3tlMgBVs2V+BB+glDnzxvjgx4gR7NB BGJHN1BpobC/ZhA2TCWp5PbEn/YRKNO8zpJ9OfLNyOGAO0xR970ZlTHVdPOX2LqUPebN mH9s31WgJGMwkoc3zds81iz7+rF9nA4lGZ3BIVrkY35QtLTYhAK4h3GE68aHrAPcCPvM RunQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=kQFafvbfWAYAEgtbd0UC35B3zHihsGxxureC6e7VIJQ=; b=XsIWo2nQ79ulFqj4DS6mezKs6GKONw0Fp+ogKDnhqzmiMF6W9fsOhNWwaG+of/UkwR h7ZJfaHcNGI00p5BCbjc8N8YLHHaGDZ7d63YWVqkzBQLO4Ohz79Y2lMhXmr6W8OKhQ7g 4HhOx9RD2H7bU+KNOEasv+FQBR46om81EDeJqHOD0KSKSifgvwc45DxpLEan9osUmuwF 6/FlHQWjuI70BHywHKvcY1+1/jvFrhxfN3NpmQb6Wx9Vjd0hqq+qT7bBxwVcmDuBhkU9 BwmlklwOJpg8XEjEcrUBllBlQtQG/az3pkPYUGnRjSGN27245fZ8he4CWcF8zfhP3DjT H95Q== X-Gm-Message-State: APt69E1VGSHpNgFqZvBacWCLa8VB11eze0SnhJ87n/0cA6rUlCICC7Vg EyuM5VNKp7pyxSm9DwunnYpoGw== X-Google-Smtp-Source: AAOMgpf3OvCN7SlSFPKaV2dGVYGLq4tSLxUnA5CdCeB1BUdOumFB45LzbL5dvBusNEcHQA9AoZ9pXA== X-Received: by 2002:a24:5995:: with SMTP id p143-v6mr263750itb.5.1530238392566; Thu, 28 Jun 2018 19:13:12 -0700 (PDT) Original-Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id p20-v6sm336685itf.4.2018.06.28.19.13.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jun 2018 19:13:11 -0700 (PDT) In-Reply-To: <87d0y1ljfr.fsf@gmail.com> (Noam Postavsky's message of "Fri, 11 May 2018 22:03:04 -0400") 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:147934 Archived-At: tags 11320 fixed close 11320 27.1 quit Noam Postavsky writes: > Would it make sense to ask about ancestor vs merge buffer even before > the "currently highlighted" query? I don't quite see why those two > should be tied together. Although with the patch below, it might be too > many queries, perhaps it's better to only ask when given a prefix arg or > something. I changed the order of the queries, so that the user can hit two "y"s in order. I found this fairly okay. I've pushed to master, we'll see if someone comes up with something better later. [1: 591bb3d900]: 2018-06-28 22:09:04 -0400 Let ediff '=' compare against ancestor buffer (Bug#11320) https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=591bb3d90018ebbcf79e6d496ed73ef396a58887