From unknown Sun Jun 22 07:32:48 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#11320 <11320@debbugs.gnu.org> To: bug#11320 <11320@debbugs.gnu.org> Subject: Status: [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when merging with an ancestor Reply-To: bug#11320 <11320@debbugs.gnu.org> Date: Sun, 22 Jun 2025 14:32:48 +0000 retitle 11320 [PATCH 2/2] Useful behavior for ediff-inferior-compare-region= s when merging with an ancestor reassign 11320 emacs submitter 11320 Dave Abrahams severity 11320 normal tag 11320 patch fixed thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 23 15:29:56 2012 Received: (at submit) by debbugs.gnu.org; 23 Apr 2012 19:29:56 +0000 Received: from localhost ([127.0.0.1]:49422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SMOxQ-0002ep-81 for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:29:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44222) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SMOxN-0002eS-Rv for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMOwV-0004vT-Sy for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:29:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:44559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwV-0004vJ-Pf for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:28:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwU-0001L3-4i for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMOwR-0004uH-E0 for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:57 -0400 Received: from mail-qc0-f169.google.com ([209.85.216.169]:59268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwR-0004tu-AC for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:55 -0400 Received: by qcsd16 with SMTP id d16so8274678qcs.0 for ; Mon, 23 Apr 2012 12:28:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=ct0++xCLcTd3UCcVKBM0P1GWLgSdMgNgtxEDG/PHCQ8=; b=JV61mXonb9jTtp2Ku64ncx2Y7eXJrSH3gI/nGGt4KDxruXSOv1/KH0Tgnfq4go/DqB HWfM6BzWNKmW1o4GOJJV+7Xp843PfUBNlM0YVlA1KJpF0j8mn5Erp4V59EgVBsSlqKKv nL6yN18s1rZgUqoJOIg6rC+Ce6o+dGOSkpe01lZD0U5LKSeMj9M+1cXrv6VsxDOw5h/I ktMN8xxhpEqMQHPzyNcF8R/z4uXuB3nWipQ0fpjYM1LpsZUweN2WYyDbdafKStZhPEM6 z+Ssw0+Cjm8SwBjERc0iprYLyL2I8gk+uill9ecAXdFmaR0BNllq/XBy70pPISaQrTdD PK5A== Received: by 10.229.136.76 with SMTP id q12mr732696qct.49.1335209332745; Mon, 23 Apr 2012 12:28:52 -0700 (PDT) Received: from pluto.local (207-172-223-249.c3-0.smr-ubr3.sbo-smr.ma.static.cable.rcn.com. [207.172.223.249]) by mx.google.com with ESMTPS id m6sm23157043qah.2.2012.04.23.12.28.51 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Apr 2012 12:28:52 -0700 (PDT) Received: by pluto.local (Postfix, from userid 501) id 53C663386B2B; Mon, 23 Apr 2012 15:28:51 -0400 (EDT) From: Dave Abrahams To: bug-gnu-emacs@gnu.org Subject: [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when merging with an ancestor Date: Mon, 23 Apr 2012 15:28:26 -0400 Message-Id: <1335209306-81494-3-git-send-email-dave@boostpro.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1335209306-81494-1-git-send-email-dave@boostpro.com> References: <1335209306-81494-1-git-send-email-dave@boostpro.com> X-Gm-Message-State: ALoCoQnyeMXH7nyeU7f9ZZY/MljKjKkMYFQKjERlwo7AvPqlpRPcIVTnlvC/fhqqHC3diDysGddr X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 208.118.235.17 X-Spam-Score: -6.2 (------) X-Debbugs-Envelope-To: submit Cc: Dave Abrahams X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.2 (------) The default, when "comparing currently-highlighted difference regions" was to compare the selected region to the entire conflict in the merge buffer. Now it simply compares the region to the highlighted part of the ancestor buffer. --- lisp/vc/ediff-util.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 046070d..393c8ad 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3557,9 +3557,11 @@ Ediff Control Panel to restore highlighting." bufB ediff-buffer-B possibilities nil))) - (if (and (ediff-valid-difference-p ediff-current-difference) + (when (and (ediff-valid-difference-p ediff-current-difference) (y-or-n-p "Compare currently highlighted difference regions? ")) - (setq use-current-diff-p t)) + (setq use-current-diff-p t) + (if ediff-merge-with-ancestor-job + (setq bufB ediff-ancestor-buffer))) (setq bufA (if use-current-diff-p (ediff-clone-buffer-for-current-diff-comparison -- 1.7.10 From debbugs-submit-bounces@debbugs.gnu.org Fri May 11 22:03:14 2018 Received: (at 11320) by debbugs.gnu.org; 12 May 2018 02:03:14 +0000 Received: from localhost ([127.0.0.1]:58819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fHJsP-0005cZ-OC for submit@debbugs.gnu.org; Fri, 11 May 2018 22:03:13 -0400 Received: from mail-it0-f49.google.com ([209.85.214.49]:40846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fHJsO-0005cL-1v for 11320@debbugs.gnu.org; Fri, 11 May 2018 22:03:12 -0400 Received: by mail-it0-f49.google.com with SMTP id j186-v6so4406924ita.5 for <11320@debbugs.gnu.org>; Fri, 11 May 2018 19:03:12 -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=TJ9bXODVL89Ji7YlX/18q+KLSrP0vh5765bTmsvvUQo=; b=Nxw3iBIQanJVzY/g9XbR5XT6KPKBj12RatXR2DkTMIIDyMh0V7akbtOuKziZdyT/d1 ma1/cJchw6UgE95l7DkmzOOBsnOnec8V5U1ZgHovSMDLdVzg6ZgWmwS6dQ+4e9UacnVO XTpHdft9DnMUKr+1PqSrFxs4IvXCqbdwDdvxfjw5PXUZqc+lBsa3ktgqdTu8yfLWfWRH j8xErY64r1jT/aPGPQnpqY8p2fwWqsDfVOfjH3T+KSzI+DoVvKg5VP8lfuk3FTVx2Yj+ lAI4myEw8VX2SMyMkPdgXIovg/R2jhXcqEhfiWSxRxIQNGWr+8JC/RLYcmX7YAjiNODw T96g== 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=TJ9bXODVL89Ji7YlX/18q+KLSrP0vh5765bTmsvvUQo=; b=NEZqeUfxMyEC+NpSKX6GxbJbDwYodWUVlPNI0sFImTW/nhDSnu3vn2/VDGeszlQycM oi3cwEkHyTgbresv83vId2LzIr/EUSg3jnDwY6lPsdPFeEQxJZxzyqBg4S6wf1rP7CjY wGFRQdrfcOJY4Xd+/SYUvLNb3k4PzAdc9uKp/6aCm7VaignNZ6I49tGo2xC4mf90n0ri No4OliRB0OKQW6Ewz8BaMBUo/AKxM0fonbADvgzEYxHh8Dr+yP6pPF5QK14rP55z+oBZ AYc7jSQKef0TkIl0bEU7A1JGH0V4aKD0uj26xtMuIYky4dlzvbrfSfBL8v+BdBNQ5MI+ uAJg== X-Gm-Message-State: ALKqPwdCP8khUZNODVAtX0tIemBOUuXY7VoHoZgqGxN0HkSCEDGuJzPF 8EWE4fBxnWva10cBaKNp4Alg0Q== X-Google-Smtp-Source: AB8JxZpEoWd/qx2Pt+sn1qAp5B7trQlV3Nn/XYVIqCC5EuSGmvTAAcgeTC229N/dCYpG4urrWJbE1g== X-Received: by 2002:a24:5bc8:: with SMTP id g191-v6mr183811itb.9.1526090586132; Fri, 11 May 2018 19:03:06 -0700 (PDT) Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id c38-v6sm2221071ioj.62.2018.05.11.19.03.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 May 2018 19:03:05 -0700 (PDT) From: Noam Postavsky To: Dave Abrahams Subject: Re: bug#11320: [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when merging with an ancestor References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-3-git-send-email-dave@boostpro.com> Date: Fri, 11 May 2018 22:03:04 -0400 In-Reply-To: <1335209306-81494-3-git-send-email-dave@boostpro.com> (Dave Abrahams's message of "Mon, 23 Apr 2012 15:28:26 -0400") Message-ID: <87d0y1ljfr.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 11320 Cc: 11320@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Dave Abrahams writes: > The default, when "comparing currently-highlighted difference regions" > was to compare the selected region to the entire conflict in the merge > buffer. Right, this is pretty useless. > - (if (and (ediff-valid-difference-p ediff-current-difference) > + (when (and (ediff-valid-difference-p ediff-current-difference) > (y-or-n-p "Compare currently highlighted difference regions? ")) > - (setq use-current-diff-p t)) > + (setq use-current-diff-p t) > + (if ediff-merge-with-ancestor-job > + (setq bufB ediff-ancestor-buffer))) 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Let-ediff-compare-against-ancestor-buffer-Bug-11320.patch Content-Description: patch >From b503830af00e38ba0d510467dea957e95668a74b Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Fri, 11 May 2018 21:56:56 -0400 Subject: [PATCH] Let ediff '=' compare against ancestor buffer (Bug#11320) * lisp/vc/ediff-util.el (ediff-inferior-compare-regions): Ask user whether to compare against the ancestor or merge buffer. Use read-multiple-choice for A vs B buffer query. --- lisp/vc/ediff-util.el | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 104a578268..c121df9eca 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3546,25 +3546,20 @@ ediff-inferior-compare-regions (ediff-paint-background-regions 'unhighlight) (cond ((ediff-merge-job) - (setq bufB ediff-buffer-C) + (setq bufB (if (and ediff-ancestor-buffer + (y-or-n-p "Compare against ancestor buffer?")) + ediff-ancestor-buffer + ediff-buffer-C)) ;; ask which buffer to compare to the merge buffer - (while (cond ((eq answer ?A) - (setq bufA ediff-buffer-A - possibilities '(?B)) - nil) - ((eq answer ?B) - (setq bufA ediff-buffer-B - possibilities '(?A)) - nil) - ((equal answer "")) - (t (beep 1) - (message "Valid values are A or B") - (sit-for 2) - t)) - (let ((cursor-in-echo-area t)) - (message - "Which buffer to compare to the merge buffer (A or B)? ") - (setq answer (capitalize (read-char-exclusive)))))) + (setq answer (car (read-multiple-choice + (format "Which buffer to compare to the %s buffer?" + (if (eq bufB ediff-ancestor-buffer) + "ancestor" "merge")) + '((?a "A") + (?b "B"))))) + (if (eq answer ?a) + (setq bufA ediff-buffer-A) + (setq bufA ediff-buffer-B))) ((ediff-3way-comparison-job) ;; ask which two buffers to compare -- 2.11.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 28 22:13:21 2018 Received: (at 11320) by debbugs.gnu.org; 29 Jun 2018 02:13:21 +0000 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 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 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) 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) From: Noam Postavsky To: Dave Abrahams Subject: Re: bug#11320: [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when merging with an ancestor References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-3-git-send-email-dave@boostpro.com> <87d0y1ljfr.fsf@gmail.com> Date: Thu, 28 Jun 2018 22:13:10 -0400 In-Reply-To: <87d0y1ljfr.fsf@gmail.com> (Noam Postavsky's message of "Fri, 11 May 2018 22:03:04 -0400") Message-ID: <87bmbunxvt.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 11320 Cc: 11320@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 22 07:32:48 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 27 Jul 2018 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator