From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Kifer Newsgroups: gmane.emacs.bugs Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Date: Fri, 14 Dec 2012 23:46:17 -0500 Message-ID: <50CC0099.3010402@stonybrook.edu> References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1355559551 30715 80.91.229.3 (15 Dec 2012 08:19:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Dec 2012 08:19:11 +0000 (UTC) Cc: 11319-done@debbugs.gnu.org To: Dave Abrahams Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Dec 15 09:19:25 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 1Tjmxt-0002ha-VC for geb-bug-gnu-emacs@m.gmane.org; Sat, 15 Dec 2012 09:19:22 +0100 Original-Received: from localhost ([::1]:36617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tjmxg-0004He-Qi for geb-bug-gnu-emacs@m.gmane.org; Sat, 15 Dec 2012 03:19:08 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:44467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tjmxa-0004AK-PD for bug-gnu-emacs@gnu.org; Sat, 15 Dec 2012 03:19:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjmxY-0006pq-99 for bug-gnu-emacs@gnu.org; Sat, 15 Dec 2012 03:19:02 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjmxY-0006pl-5X for bug-gnu-emacs@gnu.org; Sat, 15 Dec 2012 03:19:00 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TjmyY-00059n-2v for bug-gnu-emacs@gnu.org; Sat, 15 Dec 2012 03:20:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Michael Kifer Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 15 Dec 2012 08:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11319 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 11319-done@debbugs.gnu.org id=D11319.135555955819766 (code D ref 11319); Sat, 15 Dec 2012 08:20:02 +0000 Original-Received: (at 11319-done) by debbugs.gnu.org; 15 Dec 2012 08:19:18 +0000 Original-Received: from localhost ([127.0.0.1]:43307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tjmxm-00058g-OX for submit@debbugs.gnu.org; Sat, 15 Dec 2012 03:19:18 -0500 Original-Received: from exprod5og112.obsmtp.com ([64.18.0.24]:38471) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tjjel-0007ra-76 for 11319-done@debbugs.gnu.org; Fri, 14 Dec 2012 23:47:24 -0500 Original-Received: from mail-qa0-f72.google.com ([209.85.216.72]) (using TLSv1) by exprod5ob112.postini.com ([64.18.4.12]) with SMTP ID DSNKUMwAnJiH8zo4zJeR8LLGkRa9QL2vDB6j@postini.com; Fri, 14 Dec 2012 20:46:21 PST Original-Received: by mail-qa0-f72.google.com with SMTP id d13so839917qak.3 for <11319-done@debbugs.gnu.org>; Fri, 14 Dec 2012 20:46:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=c2I4hSu56acBeirAAfASsTemEKyoQ38nWDH6nbLxoiA=; b=HKkC8SauuHtMQUQ0sTvhYbe5USqMsMN6q9BVj9bQTn7S060w8oRKPIWoLlzQsIm01F 5j88ow0mwEzciyvcln0yCzPW+DtfDriCJ4mtvMPAymdtiq4wAyIXHPTNa4f8sKQ/wkdY NGvUYJIwq+8Fu/0pm0xnM2yxPf9Nl62JDMLjxkyC6hDLHOSrSfLasEYBZZ1XQtYY9Q6c AKvsZ42r+bckLB+TA23V10Acp7SK1Ojr5cC9jrpxMEbO2w46DrVUIga4Yez8fhZQCyYY 0UA0Rlljv81uDt+RkJRhE/Qm/lI+1wQnFGyPr4aynXShMHex6KgMAIQlCDgORt9pvEZH Vc5g== Original-Received: by 10.58.161.113 with SMTP id xr17mr13282525veb.3.1355546779738; Fri, 14 Dec 2012 20:46:19 -0800 (PST) Original-Received: by 10.58.161.113 with SMTP id xr17mr13282519veb.3.1355546779643; Fri, 14 Dec 2012 20:46:19 -0800 (PST) Original-Received: from [192.168.1.106] (pool-71-190-51-155.nycmny.east.verizon.net. [71.190.51.155]) by mx.google.com with ESMTPS id x17sm5407261vdi.1.2012.12.14.20.46.17 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 20:46:18 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 In-Reply-To: X-Gm-Message-State: ALoCoQmG36DjwVxyFyIblyA4D8KVF/quX1hsXC+gmj18Qv1UB/lH+vYBQAR3Y93o8l3gUIrZQ8VuCpqwbuSr/VDbZYr77aTTcJOUhEAQ1Y1MWzyLdscvHNdXZZT4Rak8KE03zdM0+CPFFz12wdOvMrPffkOB15JyRqv/BbrzYT6yIzDGdyW44Vg= X-Mailman-Approved-At: Sat, 15 Dec 2012 03:19:13 -0500 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.x 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:68539 Archived-At:
On 12/14/2012 12:17 PM, Dave Abrahams wrote:
on Fri Dec 14 2012, Stefan Monnier <monnier-AT-iro.umontreal.ca> wrote:


Version: 24.4


The buffer types passed to
ediff-clone-buffer-for-current-diff-comparison are used to select the
character ranges that participate in the inferior comparison.  Those
were being hardcoded as 'A and 'B, which was wrong.

Thank you, it looks OK, so I installed it in trunk,

        Stefan

Fantastic!  Now what about #11320, which depends on this one?  It takes
a feature from being completely useless and confusing to being
wonderful.  I'd love to be able to throw away my override of that file.
I think it is a good patch. One question: shouldn't the message
"Which buffer to compare to the merge buffer (A or B)? ")
be then changed to this?
"Which buffer to compare to the ancestor buffer (A or B)? ")

This is not part of the  #11320 patch.

--

       --- michael