From unknown Mon Aug 11 21:14:45 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#11319 <11319@debbugs.gnu.org> To: bug#11319 <11319@debbugs.gnu.org> Subject: Status: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Reply-To: bug#11319 <11319@debbugs.gnu.org> Date: Tue, 12 Aug 2025 04:14:45 +0000 retitle 11319 [PATCH 1/2] BUGFIX: select current-diff-comparison regions fo= r ediff-inferior-compare-regions correctly reassign 11319 emacs submitter 11319 Dave Abrahams severity 11319 normal tag 11319 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 23 15:29:51 2012 Received: (at submit) by debbugs.gnu.org; 23 Apr 2012 19:29:51 +0000 Received: from localhost ([127.0.0.1]:49419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SMOxK-0002eX-5u for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:29:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44178) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SMOxH-0002eD-Iu for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMOwT-0004uy-R6 for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:28:59 -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]:44558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwT-0004ur-O4 for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:28:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwQ-0001K5-Mi for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMOwN-0004tV-6r for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:54 -0400 Received: from mail-qa0-f41.google.com ([209.85.216.41]:54403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwN-0004sI-2c for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:51 -0400 Received: by mail-qa0-f41.google.com with SMTP id g27so55601qab.14 for ; Mon, 23 Apr 2012 12:28:50 -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=A2qr2mTfKcrLwed3JebaPY7Cc26MbiA3G+RmJeQEQEc=; b=AwzJOaS9EjxVwyWSaW9KlVxH9jSpY3TMEJHytEdWvbhhHbZO/vXOTFSa0eF6d1MOk7 LPRhib/cMQuvcKm9QwGkIywXkfE9zrh6Uzq1WLk74gE9Rjp9wwH9nf4IAFghWlTUiPIp zIUApG+qo59+4GZfwc0JMrx089WH3HvkGEUSsT8zUnWk37EultfLytVC8U1xf8bBoX84 nqQqefK1bHhIzrZUQHFuKmfbDLlLzvbDTpco+5+S2HLkF1fLv7rNAJvJDA0lXilc4UX3 AwEQH3ViMosKOM+ptNg3vMflTna+Z2YGczz6Fr0pOgEBzHdW4Ea9lQOe5P7LuQOxU0CS He3A== Received: by 10.224.187.210 with SMTP id cx18mr138093qab.45.1335209330219; Mon, 23 Apr 2012 12:28:50 -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 o7sm23146943qan.15.2012.04.23.12.28.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Apr 2012 12:28:49 -0700 (PDT) Received: by pluto.local (Postfix, from userid 501) id C8A643386B29; Mon, 23 Apr 2012 15:28:48 -0400 (EDT) From: Dave Abrahams To: bug-gnu-emacs@gnu.org Subject: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Date: Mon, 23 Apr 2012 15:28:25 -0400 Message-Id: <1335209306-81494-2-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: ALoCoQkHGR6QYqobiWmtl7wYtE+Q04qU4BOLq1Ww9AhMe0oVQ6yhzL9scyj5dv0E3XOy6h5b7UbE 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 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. --- lisp/vc/ediff-util.el | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 78a2163..046070d 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3378,10 +3378,18 @@ Without an argument, it saves customized diff argument, if available (set-window-buffer wind cloned-buff) cloned-buff)) -(defun ediff-clone-buffer-for-current-diff-comparison (buff buf-type reg-name) - (let ((cloned-buff (ediff-make-cloned-buffer buff reg-name)) - (reg-start (ediff-get-diff-posn buf-type 'beg)) - (reg-end (ediff-get-diff-posn buf-type 'end))) +(defun ediff-buffer-type (buffer) + (cond ((eq buffer ediff-buffer-A) 'A) + ((eq buffer ediff-buffer-B) 'B) + ((eq buffer ediff-buffer-C) 'C) + ((eq buffer ediff-ancestor-buffer) 'Ancestor) + (t nil))) + +(defun ediff-clone-buffer-for-current-diff-comparison (buff reg-name) + (let* ((cloned-buff (ediff-make-cloned-buffer buff reg-name)) + (buf-type (ediff-buffer-type buff)) + (reg-start (ediff-get-diff-posn buf-type 'beg)) + (reg-end (ediff-get-diff-posn buf-type 'end))) (ediff-with-current-buffer cloned-buff ;; set region to be the current diff region (goto-char reg-start) @@ -3555,7 +3563,7 @@ Ediff Control Panel to restore highlighting." (setq bufA (if use-current-diff-p (ediff-clone-buffer-for-current-diff-comparison - bufA 'A "-Region.A-") + bufA "-Region.A-") (ediff-clone-buffer-for-region-comparison bufA "-Region.A-"))) (ediff-with-current-buffer bufA (setq begA (region-beginning) @@ -3570,7 +3578,7 @@ Ediff Control Panel to restore highlighting." (setq bufB (if use-current-diff-p (ediff-clone-buffer-for-current-diff-comparison - bufB 'B "-Region.B-") + bufB "-Region.B-") (ediff-clone-buffer-for-region-comparison bufB "-Region.B-"))) (ediff-with-current-buffer bufB (setq begB (region-beginning) -- 1.7.10 From debbugs-submit-bounces@debbugs.gnu.org Wed May 09 21:08:00 2012 Received: (at control) by debbugs.gnu.org; 10 May 2012 01:08:00 +0000 Received: from localhost ([127.0.0.1]:43873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SSHrM-00005g-DL for submit@debbugs.gnu.org; Wed, 09 May 2012 21:08:00 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:40883 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SSHrF-00005K-2u; Wed, 09 May 2012 21:07:58 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SSHp1-0001sB-Rt; Wed, 09 May 2012 21:05:35 -0400 From: Glenn Morris To: Dave Abrahams Subject: Re: bug#11318: [Patchset] A bugfix and an arguable bugfix for ediff-inferior-compare-regions References: <1335209306-81494-1-git-send-email-dave@boostpro.com> X-Spook: bomb S Box Mena CIA Rule Psix NWO secure Lexis-Nexis X-Ran: F/;2h@1l~Q|0gxb(kjzkdW9z[Re?c@$O^v8>pq;B (Dave Abrahams's message of "Mon, 23 Apr 2012 15:28:24 -0400") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: control Cc: 11318@debbugs.gnu.org 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.9 (------) merge 11318 11319 stop > [PATCH 1/2] BUGFIX: select current-diff-comparison regions for > [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when As you can see, this style of sending patches is sub-optimal, since each mail created a separate bug report, including this one, which I am now merging with "patch 1". From debbugs-submit-bounces@debbugs.gnu.org Tue May 22 17:41:54 2012 Received: (at control) by debbugs.gnu.org; 22 May 2012 21:41:54 +0000 Received: from localhost ([127.0.0.1]:39428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWwq1-0005Lz-MI for submit@debbugs.gnu.org; Tue, 22 May 2012 17:41:53 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:46475 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWwpz-0005Lt-RH for control@debbugs.gnu.org; Tue, 22 May 2012 17:41:52 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SWwpF-0007UU-Vp for control@debbugs.gnu.org; Tue, 22 May 2012 17:41:06 -0400 Date: Tue, 22 May 2012 17:41:05 -0400 Message-Id: Subject: control message for bug 11319 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: control 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.9 (------) merge 9678 11319 From debbugs-submit-bounces@debbugs.gnu.org Tue May 22 17:43:56 2012 Received: (at control) by debbugs.gnu.org; 22 May 2012 21:43:56 +0000 Received: from localhost ([127.0.0.1]:39432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWws0-0005Po-5y for submit@debbugs.gnu.org; Tue, 22 May 2012 17:43:56 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:46530 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SWwry-0005Pi-DG for control@debbugs.gnu.org; Tue, 22 May 2012 17:43:54 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1SWwrE-00028f-DH for control@debbugs.gnu.org; Tue, 22 May 2012 17:43:08 -0400 Date: Tue, 22 May 2012 17:43:08 -0400 Message-Id: Subject: control message for bug 11319 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -6.9 (------) X-Debbugs-Envelope-To: control 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.9 (------) merge 10984 11319 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 14 10:24:56 2012 Received: (at 11319-done) by debbugs.gnu.org; 14 Dec 2012 15:24:56 +0000 Received: from localhost ([127.0.0.1]:42709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TjX8B-00057N-JY for submit@debbugs.gnu.org; Fri, 14 Dec 2012 10:24:55 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:39895) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TjX89-00057G-Ug for 11319-done@debbugs.gnu.org; Fri, 14 Dec 2012 10:24:54 -0500 Received: from 216-123-190-91.dedicated.allstream.net ([216.123.190.91]:49661 helo=ceviche.home) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TjX7C-0000dF-T9; Fri, 14 Dec 2012 10:23:55 -0500 Received: by ceviche.home (Postfix, from userid 20848) id 87531660E0; Fri, 14 Dec 2012 10:23:53 -0500 (EST) From: Stefan Monnier To: Dave Abrahams Subject: Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Message-ID: References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> Date: Fri, 14 Dec 2012 10:23:53 -0500 In-Reply-To: <1335209306-81494-2-git-send-email-dave@boostpro.com> (Dave Abrahams's message of "Mon, 23 Apr 2012 15:28:25 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -3.5 (---) X-Debbugs-Envelope-To: 11319-done Cc: Michael Kifer , 11319-done@debbugs.gnu.org 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: -4.3 (----) 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 14 12:17:58 2012 Received: (at 11319-done) by debbugs.gnu.org; 14 Dec 2012 17:17:58 +0000 Received: from localhost ([127.0.0.1]:42838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TjYta-0007il-JR for submit@debbugs.gnu.org; Fri, 14 Dec 2012 12:17:58 -0500 Received: from mail-qc0-f172.google.com ([209.85.216.172]:65222) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TjYtY-0007ic-AA for 11319-done@debbugs.gnu.org; Fri, 14 Dec 2012 12:17:57 -0500 Received: by mail-qc0-f172.google.com with SMTP id b25so2829564qca.3 for <11319-done@debbugs.gnu.org>; Fri, 14 Dec 2012 09:16:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type:x-gm-message-state; bh=N5SJpNsbkjsQTr2pllarQrMno9swGdqhDdsP0oah4Is=; b=mk++o5osdtCCrJ1Q7WJBzdArS8t+A2j42pyzXzEzOp4Qfa6HUeKvRwBhcqVo3DvwYE LMS/rG5nEezT3cwB6IrilggJP2H7iCyn98bUGIUnsLFkjV7fW8piUFqO5kblYyw0/WU2 sbnmsQzHXBuDBbt6QgX1vv/h3LyxOCgrklo6qofHNDb/g0EnN3N8ui484ee7M++wMuIR xzJ6t0kNzDYbQMrGmpqgtYWrY4IpAkA3XgWieMe+3jcUgX6xhRkjfnLUfffY8Ob7nEX6 CT1/bJOB1xynu4+S23WPL1GDq8+5/5lbA+bSzhcbVUNWQtNi2k48JmXNtb9D1t/PrlUV W9cQ== Received: by 10.49.48.43 with SMTP id i11mr3316507qen.3.1355505416758; Fri, 14 Dec 2012 09:16:56 -0800 (PST) Received: from pluto.boostpro.com (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 8sm1072217qed.6.2012.12.14.09.16.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 09:16:55 -0800 (PST) Received: by pluto.boostpro.com (Postfix, from userid 501) id 651E7853895; Fri, 14 Dec 2012 12:17:00 -0500 (EST) From: Dave Abrahams To: Stefan Monnier Subject: Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> Date: Fri, 14 Dec 2012 12:17:00 -0500 In-Reply-To: (Stefan Monnier's message of "Fri, 14 Dec 2012 10:23:53 -0500") Message-ID: User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Gm-Message-State: ALoCoQlPiDv5pqXVgxxDVi30zt46+cMtVWW3KCKferINekZ05kg5P40FmfxlM6+HbIAUoR+XRdlA X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 11319-done Cc: Michael Kifer , 11319-done@debbugs.gnu.org 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: -1.2 (-) on Fri Dec 14 2012, Stefan Monnier 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. -- Dave Abrahams BoostPro Computing Software Development Training http://www.boostpro.com Clang/LLVM/EDG Compilers C++ Boost From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 15 03:19:18 2012 Received: (at 11319-done) by debbugs.gnu.org; 15 Dec 2012 08:19:18 +0000 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 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 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 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== Received: by 10.58.161.113 with SMTP id xr17mr13282525veb.3.1355546779738; Fri, 14 Dec 2012 20:46:19 -0800 (PST) Received: by 10.58.161.113 with SMTP id xr17mr13282519veb.3.1355546779643; Fri, 14 Dec 2012 20:46:19 -0800 (PST) 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) Message-ID: <50CC0099.3010402@stonybrook.edu> Date: Fri, 14 Dec 2012 23:46:17 -0500 From: Michael Kifer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Dave Abrahams Subject: Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> In-Reply-To: Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Gm-Message-State: ALoCoQmG36DjwVxyFyIblyA4D8KVF/quX1hsXC+gmj18Qv1UB/lH+vYBQAR3Y93o8l3gUIrZQ8VuCpqwbuSr/VDbZYr77aTTcJOUhEAQ1Y1MWzyLdscvHNdXZZT4Rak8KE03zdM0+CPFFz12wdOvMrPffkOB15JyRqv/BbrzYT6yIzDGdyW44Vg= X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 11319-done X-Mailman-Approved-At: Sat, 15 Dec 2012 03:19:13 -0500 Cc: 11319-done@debbugs.gnu.org, Stefan Monnier 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: -1.6 (-)
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


From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 17 18:23:47 2012 Received: (at 11319-done) by debbugs.gnu.org; 17 Dec 2012 23:23:47 +0000 Received: from localhost ([127.0.0.1]:47703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tkk2A-0008LQ-LY for submit@debbugs.gnu.org; Mon, 17 Dec 2012 18:23:46 -0500 Received: from mail-vc0-f175.google.com ([209.85.220.175]:60434) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Tkk23-0008LE-T7 for 11319-done@debbugs.gnu.org; Mon, 17 Dec 2012 18:23:40 -0500 Received: by mail-vc0-f175.google.com with SMTP id fy7so7937013vcb.6 for <11319-done@debbugs.gnu.org>; Mon, 17 Dec 2012 15:22:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type:x-gm-message-state; bh=mUUxsVwZQN/TX4P0WOFZPJ7eTGlPKHqTh0AWIntbEgs=; b=nFNcd4R4YnjvF+Ai1g/XMtol1hRj0tDbSlUtfyTaSa1/5YpiOTobmaobJ4Fsv1W/Y/ 2nHA+NQkEPUqDy9FKNpBIOk281utqITSEEQZjjWls6q5pzZ5KRYJKBhYrbxsenMhSXOe E0LFJjYgE5CC6/qXMl4y9yg50K19/ihIx6qhFlAvCFug08572FNopJN5r9Q4e9Xkk8Ix KpqlFbIkfYHK7r7Wj2kdkn52zE4l6CLzUedl5kJgrgifZ5ZQ42cvJMwaPkeNddLMm6PP l8lYNRlbZWRxW4rd5llm75azOBm31G1Mf0AOC35ISPunE4K+IdPQXyDDr5vvI0AHM6e5 LGfw== X-Received: by 10.52.19.143 with SMTP id f15mr72309vde.13.1355786538252; Mon, 17 Dec 2012 15:22:18 -0800 (PST) Received: from pluto.boostpro.com (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 bm2sm13012928vdc.6.2012.12.17.15.22.16 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 15:22:17 -0800 (PST) Received: by pluto.boostpro.com (Postfix, from userid 501) id 3D83F89D9E0; Mon, 17 Dec 2012 18:22:15 -0500 (EST) From: Dave Abrahams To: Michael Kifer Subject: Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> <50CC0099.3010402@stonybrook.edu> Date: Mon, 17 Dec 2012 18:22:15 -0500 In-Reply-To: <50CC0099.3010402@stonybrook.edu> (Michael Kifer's message of "Fri, 14 Dec 2012 23:46:17 -0500") Message-ID: User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Gm-Message-State: ALoCoQlu5YwK+shWdV0sRy6bK5Z/2WcOOJb+TGyU4wodTbBYAPtq8qLneGQOftO1RTW9Nr6A81Hd X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 11319-done Cc: 11319-done@debbugs.gnu.org, Stefan Monnier 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: -2.6 (--) on Fri Dec 14 2012, Michael Kifer 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. From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 17 18:30:26 2012 Received: (at 11319-done) by debbugs.gnu.org; 17 Dec 2012 23:30:26 +0000 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 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 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 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) 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) Message-ID: <50CFAAB7.9030209@stonybrook.edu> Date: Mon, 17 Dec 2012 18:28:55 -0500 From: Michael Kifer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Dave Abrahams Subject: Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> <50CC0099.3010402@stonybrook.edu> In-Reply-To: Content-Type: text/html; charset=windows-1255 Content-Transfer-Encoding: 7bit X-Gm-Message-State: ALoCoQnvkLy+seC4ZuOLiRo6lx0oOgvF9YABYfkPTgLBocJD1tRi3RHY0F6EPsp+PuttJi73R2y6w3tnRRgzvMgK9oWYsM/TDfonu2avhvB8lj1ka/4rSMNubjj8IS/frKMU2mm4PEWYP9MBcPnZzTyefuYIRMFAHTWi9133ViwrvGvD+f+edGU= X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 11319-done Cc: 11319-done@debbugs.gnu.org, Stefan Monnier 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: -2.1 (--)
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.
From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 17 18:45:58 2012 Received: (at 11319-done) by debbugs.gnu.org; 17 Dec 2012 23:45:58 +0000 Received: from localhost ([127.0.0.1]:47737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TkkNg-0000S4-Rx for submit@debbugs.gnu.org; Mon, 17 Dec 2012 18:45:58 -0500 Received: from mail-vc0-f169.google.com ([209.85.220.169]:51616) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TkkNe-0000Ru-4L for 11319-done@debbugs.gnu.org; Mon, 17 Dec 2012 18:45:55 -0500 Received: by mail-vc0-f169.google.com with SMTP id gb23so8235251vcb.0 for <11319-done@debbugs.gnu.org>; Mon, 17 Dec 2012 15:44:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type:x-gm-message-state; bh=JnFNe3md1ogQioWi9+dsQ0h7Zh3N2qp28Obbn/mZj+g=; b=pUZM9mdSE4b1crtZI8BPFuxAlhgdhhSm0B9FOMSMI3MIYMju6bdAAH05RZxbUCdNxE zo0mLtEKXweznbMpPxrRYmzNzcgyiyNWXwNVweqXBoIIZcGgA331YWjhAVvkMXDfTtMr QNrveaoD7JIbNMJ9dg6OEIagJZ52LwsU/de2CTxJ/E9hVJw9jXy113q95oVmFukwjYlL sDx3u70K1ZwzcpZ4feTL5qzeoftehRdMziT3tJEQmSnDle5IS/6clLcLMItW+0FtXxT7 fOBCNRbcy7hqcGlBuPgmlvvJRS/cl4F1y34iVe+p9dF88l39ZHQklR1rQzwtyGMewOct 0i7w== X-Received: by 10.59.13.135 with SMTP id ey7mr64878ved.37.1355787876005; Mon, 17 Dec 2012 15:44:36 -0800 (PST) Received: from pluto.boostpro.com (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 vl8sm12286282veb.9.2012.12.17.15.44.34 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 15:44:35 -0800 (PST) Received: by pluto.boostpro.com (Postfix, from userid 501) id C30F589DDB3; Mon, 17 Dec 2012 18:44:32 -0500 (EST) From: Dave Abrahams To: Michael Kifer Subject: Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> <50CC0099.3010402@stonybrook.edu> <50CFAAB7.9030209@stonybrook.edu> Date: Mon, 17 Dec 2012 18:44:32 -0500 In-Reply-To: <50CFAAB7.9030209@stonybrook.edu> (Michael Kifer's message of "Mon, 17 Dec 2012 18:28:55 -0500") Message-ID: User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Gm-Message-State: ALoCoQmjeTTQFAVdWGsPxZ2o9RhEcORD+fo8KysYJaGWKkUKi8xhzIUPhkBKDSO7M0sThKbYPpgw X-Spam-Score: -1.2 (-) X-Debbugs-Envelope-To: 11319-done Cc: 11319-done@debbugs.gnu.org, Stefan Monnier 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: -2.6 (--) on Mon Dec 17 2012, Michael Kifer wrote: > On 12/17/2012 06:22 PM, Dave Abrahams wrote: > > on Fri Dec 14 2012, Michael Kifer 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. I can't understand the idea that you can't correct the behavior without also correcting the text. They are separate issues related only by the region of code in which they appear. Again, I have no opinion about whether the text should change, so if you're going to tie them together, please change the text too. The behavior is all that matters to me -- Dave Abrahams BoostPro Computing Software Development Training http://www.boostpro.com Clang/LLVM/EDG Compilers C++ Boost From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 17 19:03:20 2012 Received: (at 11319-done) by debbugs.gnu.org; 18 Dec 2012 00:03:21 +0000 Received: from localhost ([127.0.0.1]:47764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TkkeW-0000rU-4s for submit@debbugs.gnu.org; Mon, 17 Dec 2012 19:03:20 -0500 Received: from exprod5og115.obsmtp.com ([64.18.0.246]:59235) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TkkeT-0000rL-7q for 11319-done@debbugs.gnu.org; Mon, 17 Dec 2012 19:03:18 -0500 Received: from mail-gg0-f197.google.com ([209.85.161.197]) (using TLSv1) by exprod5ob115.postini.com ([64.18.4.12]) with SMTP ID DSNKUM+ydndTQ+po6+cYu+4Y7kfnh100/YvE@postini.com; Mon, 17 Dec 2012 16:01:59 PST Received: by mail-gg0-f197.google.com with SMTP id i1so344ggn.0 for <11319-done@debbugs.gnu.org>; Mon, 17 Dec 2012 16:01:58 -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=UZ0+mZe0Tbm+FLIiGTrXC8y2jJVtb3z8kP8AwVEHSq0=; b=HupPphd8gWv+9D4MT4m+xUKVGSEOtKPFcJ0txoj+S+DRxc10qnf8Eaa4Dsl3dnRA3v 3aGXgPKpApq9DIvDF/xSE62LP2qWJb0azLxFYoIGfnOKNeJGZV3nKfT1/c2BMGzmhoEH lKdpnXfXyMrtLHcsD1VXNzyq9/fC5l87o5BAFFkgdDjo2v+8x0+o/ZOby2tY1ehGrWfC XRLTPqQUXlYfCZqQpozJ3GnKOzMTSNYyarhC+i9EUy3YqWnSco8DugcnhpoviVwE/FDC u+rP+QAjK6AiRSC6RipuW+e7TcefBDDH9Tq2DcYo437lUkhJ9DEblVbr2AfTKZDzw3rt wIhQ== X-Received: by 10.52.76.73 with SMTP id i9mr174721vdw.25.1355788918127; Mon, 17 Dec 2012 16:01:58 -0800 (PST) X-Received: by 10.52.76.73 with SMTP id i9mr174645vdw.25.1355788916974; Mon, 17 Dec 2012 16:01:56 -0800 (PST) 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 b10sm13102090vdk.15.2012.12.17.16.01.54 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 17 Dec 2012 16:01:56 -0800 (PST) Message-ID: <50CFB271.8070003@stonybrook.edu> Date: Mon, 17 Dec 2012 19:01:53 -0500 From: Michael Kifer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Dave Abrahams Subject: Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly References: <1335209306-81494-1-git-send-email-dave@boostpro.com> <1335209306-81494-2-git-send-email-dave@boostpro.com> <50CC0099.3010402@stonybrook.edu> <50CFAAB7.9030209@stonybrook.edu> In-Reply-To: Content-Type: text/html; charset=windows-1255 Content-Transfer-Encoding: 7bit X-Gm-Message-State: ALoCoQkm4JTisJ1eRW7XQbKmTIzqvIyGO38l3oELG8vOAPZl12Zf2n3aZnWhkgEuuCB/jyNX+Rf5V7ffwdHsStOrQHeqzu9trdTNHlRIAZ5G7aJt4SL3VPeU2DhG7t36VUInKpbc8KqqM+WIq7lw0+/3pgEW5IYZaZcM06E9W5ltwsFGwFB3k9k= X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 11319-done Cc: 11319-done@debbugs.gnu.org, Stefan Monnier 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: -1.6 (-)
On 12/17/2012 06:44 PM, Dave Abrahams wrote:
on Mon Dec 17 2012, Michael Kifer <michael.kifer-AT-stonybrook.edu> wrote:


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.

I can't understand the idea that you can't correct the behavior without
also correcting the text.  They are separate issues related only by the
region of code in which they appear.  Again, I have no opinion about
whether the text should change, so if you're going to tie them together,
please change the text too.  The behavior is all that matters to me

I cannot understand how it can be acceptable when a program tells the user it is going to do one thing, but does something else.
From unknown Mon Aug 11 21:14:45 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 15 Jan 2013 12: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