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: Mon, 17 Dec 2012 18:28:55 -0500 Message-ID: <50CFAAB7.9030209@stonybrook.edu> References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> <50CC0099.3010402@stonybrook.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/html; charset=windows-1255 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1355786999 11904 80.91.229.3 (17 Dec 2012 23:29:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Dec 2012 23:29:59 +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 Tue Dec 18 00:30:10 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 1Tkk8P-0006tI-5m for geb-bug-gnu-emacs@m.gmane.org; Tue, 18 Dec 2012 00:30:09 +0100 Original-Received: from localhost ([::1]:40055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkk8B-0001FL-QU for geb-bug-gnu-emacs@m.gmane.org; Mon, 17 Dec 2012 18:29:55 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:54015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkk85-0001FB-TG for bug-gnu-emacs@gnu.org; Mon, 17 Dec 2012 18:29:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tkk81-0000pz-MJ for bug-gnu-emacs@gnu.org; Mon, 17 Dec 2012 18:29:49 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tkk81-0000pa-Ii for bug-gnu-emacs@gnu.org; Mon, 17 Dec 2012 18:29:45 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Tkk9G-0008WQ-CJ for bug-gnu-emacs@gnu.org; Mon, 17 Dec 2012 18:31: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: Mon, 17 Dec 2012 23:31: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.135578702632718 (code D ref 11319); Mon, 17 Dec 2012 23:31:02 +0000 Original-Received: (at 11319-done) by debbugs.gnu.org; 17 Dec 2012 23:30:26 +0000 Original-Received: from localhost ([127.0.0.1]:47711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tkk8c-0008VZ-KQ for submit@debbugs.gnu.org; Mon, 17 Dec 2012 18:30:26 -0500 Original-Received: from exprod5og113.obsmtp.com ([64.18.0.26]:52139) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tkk8W-0008VN-Ka for 11319-done@debbugs.gnu.org; Mon, 17 Dec 2012 18:30:21 -0500 Original-Received: from mail-qa0-f72.google.com ([209.85.216.72]) (using TLSv1) by exprod5ob113.postini.com ([64.18.4.12]) with SMTP ID DSNKUM+qug2azpYUx36IGE+xVNQiGh5OphVb@postini.com; Mon, 17 Dec 2012 15:28:59 PST Original-Received: by mail-qa0-f72.google.com with SMTP id d13so278893qak.3 for <11319-done@debbugs.gnu.org>; Mon, 17 Dec 2012 15:28:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-received: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=8B6K8lV/sZcpcGOdCpMQHe22lQh4XhurOmLGxp+fbPo=; b=Yyz3jtpYLH3fgVhNl1EOKw0z6+1B83Dq12uhQfpuCCkUJr1PrIrpnvFY4hSLEznXiq 7hpOZQnjZ1CFwDk5yrfNMwDM4AdQ8mqVN7sUMafuQSi0geVRjO2Up0pPpcMG2axefwdw VHyKPDSS1UTLNlxLFGtOtRKYzDSDhhWAqmul08BcZOls1mHbG5U8rxt/Wn/Faa0ECG71 FEmSk8IUUyUXu5R+SlqeHczcbfwZrVl719fGPCdAwoo/25Wde/IjrrFyZKn/XSU0Fg4f e4H/H0lsCnlmpflxXcNW/BsZe28tMfJuIdgtTjtDVKaPKkteg0IyvzKpGRhZdwjgUJ0P bQ8Q== X-Received: by 10.58.221.130 with SMTP id qe2mr92896vec.14.1355786937754; Mon, 17 Dec 2012 15:28:57 -0800 (PST) X-Received: by 10.58.221.130 with SMTP id qe2mr92884vec.14.1355786937621; Mon, 17 Dec 2012 15:28:57 -0800 (PST) Original-Received: from [130.245.25.97] (roswellnet.cs.sunysb.edu. [130.245.128.107]) by mx.google.com with ESMTPS id dh10sm12252450veb.8.2012.12.17.15.28.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 15:28:56 -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: ALoCoQnvkLy+seC4ZuOLiRo6lx0oOgvF9YABYfkPTgLBocJD1tRi3RHY0F6EPsp+PuttJi73R2y6w3tnRRgzvMgK9oWYsM/TDfonu2avhvB8lj1ka/4rSMNubjj8IS/frKMU2mm4PEWYP9MBcPnZzTyefuYIRMFAHTWi9133ViwrvGvD+f+edGU= 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:68677 Archived-At:
On 12/17/2012 06:22 PM, Dave Abrahams wrote:
on Fri Dec 14 2012, Michael Kifer <michael.kifer-AT-stonybrook.edu> wrote:


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.

I have no opinion about the change from "merge" to "ancestor."  It makes
absolutely no difference to me which of those words Emacs uses; I'll
interpret it exactly the same way.  I suggest you accept the patch as-is
and open a separate issue if you think the word is wrong.
The merge buffer is not the ancestor buffer, so the message would be wrong and confusing.
We should change both or none.