From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dave Abrahams Newsgroups: gmane.emacs.bugs Subject: bug#11320: [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> References: <1335209306-81494-1-git-send-email-dave@boostpro.com> NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1335209372 12691 80.91.229.3 (23 Apr 2012 19:29:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 Apr 2012 19:29:32 +0000 (UTC) Cc: Dave Abrahams To: 11320@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 23 21:29:31 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SMOwx-0001Yq-8r for geb-bug-gnu-emacs@m.gmane.org; Mon, 23 Apr 2012 21:29:27 +0200 Original-Received: from localhost ([::1]:53001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOww-0001Rz-Kq for geb-bug-gnu-emacs@m.gmane.org; Mon, 23 Apr 2012 15:29:26 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOws-0001Lg-NC for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:29:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMOwq-00050c-Tf for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:29:22 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48392) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwq-00050M-QT for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:29:20 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SMOxX-0002g2-Gi for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:30:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dave Abrahams Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 23 Apr 2012 19:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11320 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.133520939610222 (code B ref -1); Mon, 23 Apr 2012 19:30:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Apr 2012 19:29:56 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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== Original-Received: by 10.229.136.76 with SMTP id q12mr732696qct.49.1335209332745; Mon, 23 Apr 2012 12:28:52 -0700 (PDT) Original-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) Original-Received: by pluto.local (Postfix, from userid 501) id 53C663386B2B; Mon, 23 Apr 2012 15:28:51 -0400 (EDT) X-Mailer: git-send-email 1.7.10 In-Reply-To: <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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:59414 Archived-At: 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