From unknown Sun Jun 22 04:08:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly 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:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11319 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 11319@debbugs.gnu.org Cc: Dave Abrahams X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.133520939110205 (code B ref -1); Mon, 23 Apr 2012 19:30:02 +0000 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 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-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 unknown Sun Jun 22 04:08:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Dave Abrahams Subject: bug#11319: closed (Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly) Message-ID: References: <1335209306-81494-2-git-send-email-dave@boostpro.com> X-Gnu-PR-Message: they-closed 11319 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 11319@debbugs.gnu.org Date: Fri, 14 Dec 2012 15:25:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1355498702-19694-1" This is a multi-part message in MIME format... ------------=_1355498702-19694-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for edif= f-inferior-compare-regions correctly which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 11319@debbugs.gnu.org. --=20 11319: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D11319 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1355498702-19694-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 ------------=_1355498702-19694-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 ------------=_1355498702-19694-1-- From unknown Sun Jun 22 04:08:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Brent Goodrick Subject: bug#9678: closed (Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly) Message-ID: References: <20108.63237.89473.542377@gargle.gargle.HOWL> X-Gnu-PR-Message: they-closed 9678 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 9678@debbugs.gnu.org Date: Fri, 14 Dec 2012 15:25:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1355498703-19694-3" This is a multi-part message in MIME format... ------------=_1355498703-19694-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #11319: 24.0.50; ediff-inferior-compare-regions ignores user response for e= diff buffer selection which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 9678@debbugs.gnu.org. --=20 11319: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D11319 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1355498703-19694-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 ------------=_1355498703-19694-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 6 Oct 2011 00:32:38 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RBbt6-0006BS-RB for submit@debbugs.gnu.org; Wed, 05 Oct 2011 20:32:37 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RBbt2-0006BB-5Q for submit@debbugs.gnu.org; Wed, 05 Oct 2011 20:32:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBbsp-000449-BC for submit@debbugs.gnu.org; Wed, 05 Oct 2011 20:32:21 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_TO_NO_BRKTS_FREEMAIL autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:46009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBbsp-00043z-9O for submit@debbugs.gnu.org; Wed, 05 Oct 2011 20:32:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBbsn-0003O9-1T for bug-gnu-emacs@gnu.org; Wed, 05 Oct 2011 20:32:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBbsk-00043Y-8K for bug-gnu-emacs@gnu.org; Wed, 05 Oct 2011 20:32:16 -0400 Received: from mail-yx0-f169.google.com ([209.85.213.169]:39017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBbsk-00043U-2h for bug-gnu-emacs@gnu.org; Wed, 05 Oct 2011 20:32:14 -0400 Received: by yxi19 with SMTP id 19so2522236yxi.0 for ; Wed, 05 Oct 2011 17:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:mime-version:content-type:content-transfer-encoding:message-id :date:to:subject:x-mailer; bh=Tc5Lr6RhBSPyXb9wCEeB8kXky9ANXTQd0Au8yaDOaH8=; b=rw79OXN3Im27Bk/PrJGdvktCE4ehKue723m7tChYZqg4aN7pKksbQskDNLOTPGGfsI e8GiLRt0O9qik0mjvpV4JyPl77Qy/uLPrHaoKnHvR4Et7RmUgH3Bs0pnBnRsKv/yClxb pFYgwT7JpG6aOMy6SDbsDE0mg044tj8flzMQU= Received: by 10.68.26.169 with SMTP id m9mr1267016pbg.12.1317861133161; Wed, 05 Oct 2011 17:32:13 -0700 (PDT) Received: from hungover.thisisbogus.com (76-14-221-179.or.wavecable.com. [76.14.221.179]) by mx.google.com with ESMTPS id ki1sm12968739pbb.3.2011.10.05.17.32.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Oct 2011 17:32:12 -0700 (PDT) From: Brent Goodrick MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <20108.63237.89473.542377@gargle.gargle.HOWL> Date: Wed, 5 Oct 2011 17:32:05 -0700 To: bug-gnu-emacs@gnu.org Subject: 24.0.50; ediff-inferior-compare-regions ignores user response for ediff buffer selection X-Mailer: VM 8.2.0a1 under 24.0.50.1 (x86_64-unknown-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -4.9 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 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: -5.1 (-----) This bug report will be sent to the Free Software Foundation, not to your local site managers! Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your report will be posted to the bug-gnu-emacs@gnu.org mailing list and the gnu.emacs.bug news group, and at http://debbugs.gnu.org. Please describe exactly what actions triggered the bug and the precise symptoms of the bug. If you can, give a recipe starting from `emacs -Q': How to reproduce: 1. Open up three separate buffers. 2. Add the same content into all three buffers, except arrange for the content to be different on all three buffers on one of the lines (This is just to get a difference to run through `ediff-inferior-compare-regions'). 3. Run `ediff-buffers3' and select each of the three buffers 4. Type 'n' to go to the first difference. 5. Type '=' t run `ediff-inferior-compare-regions' 6. When prompted for "Enter the 1st buffer you want to compare", answer with 'a'. 7. When prompted for "Enter the 2nd buffer you want to compare" , answer with 'c'. 8. When prompted for "Compare currently highlighted difference regions?" answer with 'y'. 9. Notice that the new ediff session has the region for the B buffer and not the C buffer. My analysis: I believe the bug is the hardcoding of 'A and 'B buf-types in both calls to `ediff-clone-buffer-for-current-diff-comparison' made inside the `ediff-inferior-compare-regions' function here: (ediff-clone-buffer-for-current-diff-comparison bufA 'A "-Region.A-") And here: (ediff-clone-buffer-for-current-diff-comparison bufB 'B "-Region.B-") Here is a possible fixed version of the function where I introduced the buf-type-A and buf-type-B local variables to store the 'A, 'B, or 'C symbols corresponding to the users selection, and used those values in the calls to `ediff-clone-buffer-for-current-diff-comparison': (defun ediff-inferior-compare-regions () "Compare regions in an active Ediff session. Like ediff-regions-linewise but is called from under an active Ediff session on the files that belong to that session. After quitting the session invoked via this function, type C-l to the parent Ediff Control Panel to restore highlighting." (interactive) (let ((answer "") (possibilities (list ?A ?B ?C)) (zmacs-regions t) use-current-diff-p begA begB endA endB bufA bufB buf-type-A buf-type-B) (if (ediff-valid-difference-p ediff-current-difference) (progn (ediff-set-fine-diff-properties ediff-current-difference 'default) (ediff-unhighlight-diff))) (ediff-paint-background-regions 'unhighlight) (flet ((char-to-buf-type (char) (cond ((eq char ?A) 'A) ((eq char ?B) 'B) ((eq char ?C) 'C) (t (error "Assertion failed: invalid character %S" char))))) (cond ((ediff-merge-job) (setq bufB ediff-buffer-C) ;; ask which buffer to compare to the merge buffer (while (cond ((eq answer ?A) (setq bufA ediff-buffer-A possibilities '(?B) buf-type-B (char-to-buf-type answer)) nil) ((eq answer ?B) (setq bufA ediff-buffer-B possibilities '(?A) buf-type-B (char-to-buf-type answer)) 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)))))) ((ediff-3way-comparison-job) ;; ask which two buffers to compare (while (cond ((memq answer possibilities) (setq possibilities (delq answer possibilities)) (setq bufA (eval (ediff-get-symbol-from-alist answer ediff-buffer-alist))) (setq buf-type-A (char-to-buf-type answer)) nil) ((equal answer "")) (t (beep 1) (message "Valid values are %s" (mapconcat 'char-to-string possibilities " or ")) (sit-for 2) t)) (let ((cursor-in-echo-area t)) (message "Enter the 1st buffer you want to compare (%s): " (mapconcat 'char-to-string possibilities " or ")) (setq answer (capitalize (read-char-exclusive))))) (setq answer "") ; silence error msg (while (cond ((memq answer possibilities) (setq possibilities (delq answer possibilities)) (setq bufB (eval (ediff-get-symbol-from-alist answer ediff-buffer-alist))) (setq buf-type-B (char-to-buf-type answer)) nil) ((equal answer "")) (t (beep 1) (message "Valid values are %s" (mapconcat 'char-to-string possibilities " or ")) (sit-for 2) t)) (let ((cursor-in-echo-area t)) (message "Enter the 2nd buffer you want to compare (%s): " (mapconcat 'char-to-string possibilities "/")) (setq answer (capitalize (read-char-exclusive)))))) (t ; 2way comparison (setq bufA ediff-buffer-A bufB ediff-buffer-B possibilities nil)))) (if (and (ediff-valid-difference-p ediff-current-difference) (y-or-n-p "Compare currently highlighted difference regions? ")) (setq use-current-diff-p t)) (setq bufA (if use-current-diff-p (ediff-clone-buffer-for-current-diff-comparison bufA buf-type-A "-Region.A-") (ediff-clone-buffer-for-region-comparison bufA "-Region.A-"))) (ediff-with-current-buffer bufA (setq begA (region-beginning) endA (region-end)) (goto-char begA) (beginning-of-line) (setq begA (point)) (goto-char endA) (end-of-line) (or (eobp) (forward-char)) ; include the newline char (setq endA (point))) (setq bufB (if use-current-diff-p (ediff-clone-buffer-for-current-diff-comparison bufB buf-type-B "-Region.B-") (ediff-clone-buffer-for-region-comparison bufB "-Region.B-"))) (ediff-with-current-buffer bufB (setq begB (region-beginning) endB (region-end)) (goto-char begB) (beginning-of-line) (setq begB (point)) (goto-char endB) (end-of-line) (or (eobp) (forward-char)) ; include the newline char (setq endB (point))) (ediff-regions-internal bufA begA endA bufB begB endB nil ; setup-hook (if use-current-diff-p ; job name 'ediff-regions-wordwise 'ediff-regions-linewise) (if use-current-diff-p ; word mode, if diffing current diff t nil) ;; setup param to pass to ediff-setup (list (cons 'ediff-split-window-function ediff-split-window-function))))) I did not test the "ediff-merge-job" case but I suspect it also needs to set the buf-type-A and buf-type-B variables. The 'char-to-buf-type' local function could be written more concisely, but I could not find a way to map a ?A character to a 'A symbol without resorting to a clunky cond construct. If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. For information about debugging Emacs, please read the file /home/brentg/install/Linux.x86_64/share/emacs/24.0.50/etc/DEBUG. In GNU Emacs 24.0.50.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.20.1) of 2011-01-15 on hungover Windowing system distributor `The X.Org Foundation', version 11.0.10707000 configured using `configure '--with-x-toolkit' '--with-xft' '--prefix=/home/brentg/install/Linux.x86_64'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_US.UTF-8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: Shell Minor modes in effect: desktop-save-mode: t auto-insert-mode: t erc-ring-mode: t erc-services-mode: t erc-networks-mode: t shell-dirtrack-mode: t delete-selection-mode: t iswitchb-mode: t display-time-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: 1 transient-mark-mode: t abbrev-mode: t Recent input: r h y w M-x r e p o r t - e m b Recent messages: History item: 498 History item: 499 History item: 500 ~ Completing command name... Completed Type C-x 1 to delete the help window. mouse-2, RET: find function's definition Renamed transient buffer "*Help*" to "*Help*<2>" uncompressing ediff-util.el.gz...done Load-path shadows: /home/brentg/emacs_lisp_imported/slime/tree-widget hides /home/brentg/install/Linux.x86_64/share/emacs/24.0.50/lisp/tree-widget /home/brentg/emacs_lisp_imported/remember/remember hides /home/brentg/install/Linux.x86_64/share/emacs/24.0.50/lisp/textmodes/remember /home/brentg/emacs_lisp_imported/css-mode/css-mode hides /home/brentg/install/Linux.x86_64/share/emacs/24.0.50/lisp/textmodes/css-mode Features: (shadow mailalias bbdb-vm vm-autoload bbdb-snarf mail-extr rfc822 bbdb-com vm-rfaddons vm-message vm-macro multi-isearch emacsbug ansi-color bg-emacs bg-desktop-setup conf-mode nxml-uchnm rng-xsd xsd-regexp rng-cmpct vc-git skeleton desktop bg-customizations bg-kmacro-setup bg-match-util bg-x-setup bg-ebrowse-setup ebrowse ebuff-menu electric bg-init-program-setup bg-dos-batch-mode bg-cmake-setup cmake-mode bg-quack-setup quack bg-qmake-setup bg-allout-setup bg-gimp-mode-setup eldoc cmuscheme scheme gimp-mode scheme-complete snippet autoinsert bg-edebug-setup edebug bg-lisppaste-setup bg-instrument-util bg-calc-setup calc-ext calc calc-loaddefs calc-macs bg-sudo-setup sudo bg-crontab-util bg-reminder bg-wikipedia-mode-setup wikipedia-mode bg-outline-magic-mode-setup outline-magic noutline outline bg-emacs-lisp-mode-setup bg-lisp-util find-func bg-lisp-setup bg-stumpwm-setup stumpwm-mode bg-css-mode-setup bg-gnuserv-setup gnuserv bg-compressed-files-setup bg-apropos-mode-setup apropos bg-search-tcl bg-man-setup bg-env-setup man assoc bg-visual-basic-mode-setup bg-regr-util bg-help-mode-setup help-mode bg-diag bg-password-hiding-setup bg-browser-setup bg-x-windows-util bg-perl-setup gud bg-perl-util bg-rectangle-setup bg-picture-mode-setup bg-xml-setup rng-nxml rng-valid rng-loc rng-uri rng-parse nxml-parse rng-match rng-dt rng-util rng-pttrn nxml-ns nxml-mode nxml-outln nxml-rap nxml-util nxml-glyph nxml-enc xmltok bg-boxquote-setup boxquote bg-iswitchb-setup bg-outline-setup allout bg-autosave-setup bg-mgc-specific-setup bg-local-directory-registry-util bg-mail-abbrev-setup mailabbrev uniquify ibuffer bg-planner-setup bg-planner-indexing bg-planner-yank-link bg-planner-yank-link-man bg-planner-yank-link-file bg-planner-yank-link-info bg-web-util mm-url url url-proxy url-privacy url-expand url-methods url-history url-cookie url-util url-parse auth-source netrc url-vars mailcap bg-planner-yank-link-w3m bg-w3m-util bg-search-object-regexp-instruction-list bg-search-object-simple bg-search-object-none bg-planner-yank-link-base bg-search-object-base bg-planner-elisp bg-remember-mode-setup remember-planner remember bg-bbdb-setup bbdb-autoloads bbdb bg-planner-note-util bg-elisp-unit-test-util bg-planner-util bg-muse-hacks image-file planner-lisp planner-publish muse-xml planner cal-menu calendar cal-loaddefs sort muse-colors bg-muse-setup bg-planner-abbrevs-setup muse-html muse-xml-common cus-edit cus-start cus-load muse-publish muse-project muse-protocols muse-regexps muse muse-nested-tags muse-mode bg-cleanup-whitespace-at-point bg-planner-vars timeclock bg-scrolling-setup bg-irc-setup erc-ring erc-join erc-services erc-networks erc-dcc erc-fill erc-stamp erc-goodies erc erc-backend erc-compat format-spec bg-ediff-setup bg-info-setup bg-completion-list-mode-setup bg-global-key-mappings bg-wrap-variable-util bg-rx-interactive bg-grep-setup bg-grep-group grep bg-color-moccur-setup color-moccur bg-search-replace-util bg-occur-mode-setup bg-find-file-setup bg-bookmark-definitions bookmark pp bg-tabstop-definitions bg-mail-setup vm-w3m vm-pine vm-mark vm-save vm-virtual vm-summary-faces vm-edit vm-imap vm-pop vm-delete vm-digest vm-reply vm-toolbar vm-sort vm-undo vm-page vm-motion vm-thread vm-mouse vm-minibuf vm-mime vm-menu tapestry vm-window vm-crypto vm-summary vm-folder vm-misc vm vm-autoloads vm-version vm-vars bg-encryption-setup dgpg generic epa-file epa derived epg epg-config bg-w3m-setup edmacro kmacro w3m browse-url doc-view jka-compr image-mode timezone w3m-hist w3m-fb bookmark-w3m w3m-ems w3m-ccl ccl w3m-favicon w3m-image w3m-proc w3m-util supercite regi smtpmail sendmail bg-gnus-definitions imap gnus gnus-ems nnheader gnus-util mail-utils mm-util mail-prsvr wid-edit bg-octave-setup bg-scm-setup bg-vc-util vc pcvs pcvs-parse pcvs-info pcvs-defs bg-git-setup git log-edit easy-mmode pcvs-util add-log ewoc bg-tcl-mode-setup bg-compile-setup bg-grep-compilation-util bg-python-mode-setup python-21 python bg-buffer-menu-setup warnings bg-makefile-mode-setup bg-shell-script-mode-setup sh-script executable bg-dbx bg-gdb bg-gdb-util bg-javascript-setup js byte-opt bytecomp byte-compile json imenu newcomment bg-java-setup bg-minibuffer-setup bg-frame-definitions bg-vc-mode-setup vc-dispatcher bg-dired-extensions bg-pdf-setup bg-pdf-util dired-aux dired bg-forms-mode-setup forms-mode forms bg-isearch-setup bg-display-setup bg-cc-mode-setup bg-debug-util bg-narrowing-setup bg-cxx-nav bg-run-immediate bg-window-config-helper bg-id-utils-setup idutils compile info bg-info-util bg-symbol-stack bg-cxx-util bg-cxx-scan-debug-mode-base bg-basic-regexps-and-chars bg-p4-setup p4-hacks p4 advice help-fns advice-preload bg-p4-completion bg-p4-resolve bg-set-util bg-ediff-sparse-mode bg-ediff-sparse-mode-base bg-p4-manual-apply-mode bg-p4-manual-apply-mode-base bg-error-nav-util bg-rx-extra bg-shell-mode-setup bg-shell-util bg-abbrev-skeleton-util bg-background time-date bg-rlogin-setup rlogin shell comint ring bg-open-file-at-point bg-p4-scan-mode bg-p4-scan-mode-base view bg-button-mode-util bg-p4-basic-button bg-p4-util cc-mode cc-fonts easymenu cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs bg-pushfile-util bg-unit-test-util bg-elisp-debug-util elp perl-mode mouse-sel thingatpt rect bg-delete-selection-mode-setup delsel bg-utility iswitchb bg-file-cleanup bg-os-util bg-win32-utility regexp-opt rx bg-win32-paths bg-linux-utility help-macro ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff bg-coding-system-setup time bg-basic-setup bg-emacs-config cl lisppaste-autoloads xml-rpc-autoloads package reporter tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button minibuffer faces cus-face files text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) ------------=_1355498703-19694-3-- From unknown Sun Jun 22 04:08:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Dave Abrahams Subject: bug#10984: closed (Re: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly) Message-ID: References: X-Gnu-PR-Message: they-closed 10984 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 10984@debbugs.gnu.org Date: Fri, 14 Dec 2012 15:25:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1355498703-19694-5" This is a multi-part message in MIME format... ------------=_1355498703-19694-5 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #11319: 24.0.94; ediff-inferior-compare-regions doesn't seem to work proper= ly which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 10984@debbugs.gnu.org. --=20 11319: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D11319 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1355498703-19694-5 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 ------------=_1355498703-19694-5 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 9 Mar 2012 18:26:34 +0000 Received: from localhost ([127.0.0.1]:40899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S64WL-0002xt-Qi for submit@debbugs.gnu.org; Fri, 09 Mar 2012 13:26:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42933) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1S64WF-0002x6-9I for submit@debbugs.gnu.org; Fri, 09 Mar 2012 13:26:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S64VF-0000hW-Fg for submit@debbugs.gnu.org; Fri, 09 Mar 2012 13:25:26 -0500 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]:42357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S64VF-0000hS-BP for submit@debbugs.gnu.org; Fri, 09 Mar 2012 13:25:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S64V9-0007Ii-Op for bug-gnu-emacs@gnu.org; Fri, 09 Mar 2012 13:25:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S64V0-0000dr-AQ for bug-gnu-emacs@gnu.org; Fri, 09 Mar 2012 13:25:15 -0500 Received: from mail-vw0-f41.google.com ([209.85.212.41]:36292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S64V0-0000Zy-1M for bug-gnu-emacs@gnu.org; Fri, 09 Mar 2012 13:25:06 -0500 Received: by vbbey12 with SMTP id ey12so1868945vbb.0 for ; Fri, 09 Mar 2012 10:25:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:user-agent:mime-version :content-type:x-gm-message-state; bh=7342Xniuqla1ydWSMsyF8xqNnMiqflfq2nozarFoA2U=; b=oi36xpysmtphZt8GyagaOCwmX1FP9ypHrgPA90s9epwHpPasBNXbPXZdtJHFanyHd4 3OsW9ZHjMnAsOftWBvFeL1M13HhuIw4DN+AdAqlhXB2cLCn5mRabvBmVkJ09ysySZGqw mWx1KGxT01PNfjBSlH+5H2RuRBGM/rU4mmzp47sKPkUP8pKnI2ji/BNdTUWDR1/8dv8x ZSyeDLbyJj4g3b0N/q9ZvKVktJlDjxdEVAbraU3x3UJakUiCfykGFPaV9hHNfkruUpLU ukQJtUR7nSe9wfbZ1zmu1h1JkIIRmLnBPB4o7+Wpp/ZwHDNBwmsmRtMXorvON8naegJF GYUQ== Received: by 10.52.24.40 with SMTP id r8mr5172239vdf.108.1331317502453; Fri, 09 Mar 2012 10:25:02 -0800 (PST) Received: from pluto.luannocracy.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 a19sm12070337vdh.12.2012.03.09.10.25.01 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 09 Mar 2012 10:25:01 -0800 (PST) Received: by pluto.luannocracy.com (Postfix, from userid 501) id 9EA702B4B572; Fri, 9 Mar 2012 13:25:00 -0500 (EST) From: Dave Abrahams To: bug-gnu-emacs@gnu.org Subject: 24.0.94; ediff-inferior-compare-regions doesn't seem to work properly Date: Fri, 09 Mar 2012 13:24:59 -0500 Message-ID: User-Agent: Gnus/5.130004 (Ma Gnus v0.4) Emacs/24.0.94 (darwin) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Gm-Message-State: ALoCoQmv5xp7PP+YR+ibuMAHzM1/BDPxPE+3Os5hlCn/8IOz1NntC6BIGRbKXXQhlAgEcIE9cob/ 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 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 (------) --=-=-= Content-Type: text/plain The report will be sent to bug-gnu-emacs@gnu.org: Please make sure that the bug is specific to the Mac port. Other bugs should be sent to the place you are guided with M-x report-emacs-bug on some official ports such as X11 or NS. Please describe exactly what actions triggered the bug, and the precise symptoms of the bug. If you can, give a recipe starting from `emacs -Q': 0. put the enclosed files in /tmp 1. emacs -Q 2. `M-: (ediff-merge-files-with-ancestor "/tmp/a.txt" "/tmp/b.txt" "/tmp/ancestor.txt") RET' 3. `SPC' 4. `= b y' With the ancestor buffer containing this: --8<---------------cut here---------------start------------->8--- This is the ancestor buffer <<<<<<< variant A quack! >>>>>>> variant B It has some old text in it that has been lying around getting musty for ages. It's as old as the hills. And now you want ####### Ancestor It has some old text in it that has been lying around getting musty for aeons. And now you want ======= end me to compare it with your work? Some nerve! --8<---------------cut here---------------end--------------->8--- I expected it to do an ediff of the chunk headed by ">>>>>>> variant B" with the chunk headed by "####### Ancestor" but instead I get the following regions under comparison: --8<---------------cut here---------------start------------->8--- It has some old text in it --8<---------------cut here---------------end--------------->8--- - and - --8<---------------cut here---------------start------------->8--- <<<<<<< variant A quack! >>>>>>> variant B It has some old text in it that has been lying around getting musty for ages. It's as old as the hills. And now you want --8<---------------cut here---------------end--------------->8--- --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=a.txt This is the ancestor buffer quack! me to compare it with your work? Some nerve! --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=b.txt This is the ancestor buffer It has some old text in it that has been lying around getting musty for ages. It's as old as the hills. And now you want me to compare it with your work? Some nerve! --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=ancestor.txt This is the ancestor buffer It has some old text in it that has been lying around getting musty for aeons. And now you want me to compare it with your work? Some nerve! --=-=-= Content-Type: text/plain If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. For information about debugging Emacs, please read the file /opt/local/share/emacs/24.0.94/etc/DEBUG. In GNU Emacs 24.0.94.1 (x86_64-apple-darwin11.3.0, Carbon Version 1.6.0 AppKit 1138.32) of 2012-03-03 on pluto.luannocracy.com Windowing system distributor `Apple Inc.', version 10.7.3 Configured using: `configure '--prefix=/opt/local' '--with-mac' '--enable-mac-app=/opt/local/var/macports/build/_Users_dave_Public_MacPorts_Portfiles_editors_emacs24-macport/emacs24-macport/work/destroot/Applications/MacPorts' '--without-x' '--without-dbus' 'CC=ccache /usr/bin/gcc' 'CFLAGS=-pipe -O2 -fno-pie -O2 -m64' 'LDFLAGS=-L/opt/local/lib -fno-pie' 'CPPFLAGS=-I/opt/local/include'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: nil value of $XMODIFIERS: nil locale-coding-system: iso-latin-1-unix default enable-multibyte-characters: t Major mode: Lisp Interaction Minor modes in effect: recentf-mode: t highlight-changes-visible-mode: t diff-auto-refine-mode: t pretty-control-l-mode: t Info-breadcrumbs-in-mode-line-mode: t workgroups-mode: t shell-dirtrack-mode: t me-minor-mode: t show-paren-mode: t server-mode: t ido-everywhere: t global-ede-mode: t global-auto-revert-mode: t display-time-mode: t delete-selection-mode: t tooltip-mode: t mac-mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-x C-n C-x C-n C-n C-x C-n C-p C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-a C-SPC C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-SPC C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-x C-p C-p C-p C-p C-p C-p C-p C-p C-p C-x C-n C-x C-n SPC p ? = b y SPC SPC SPC q y C-x C-b | | | | ? p SPC = C-g C-g ? ? C-h k = C-e C-, C-, C-, C-, C-, C-, C-, C-SPC C-. C-. C-. C-. M-w C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-a C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-p C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-x C-b C-x C-b C-x C-n l | | C-z C-n M-x e m a c s - g u g b u g C-a r e p Recent messages: Region 15 in buffer A is empty Region 17 in buffer A is empty Which buffer to compare to the merge buffer (A or B)? Quit [2 times] Type "q" to delete help window. Mark set byte-code: End of buffer [2 times] Auto-saving...done byte-code: End of buffer Switched: ( 0: Gnus | *1: zi* | -<{ 2: winexe }>- | 3: clang | 4: training ) Load-path shadows: /Users/dave/.emacs.d/el-get/package/elpa/xml-rpc-1.6.7/xml-rpc hides /Users/dave/.emacs.d/el-get/xml-rpc-el/xml-rpc /Users/dave/.emacs.d/el-get/nognus/lisp/gravatar hides /Users/dave/.emacs.d/el-get/gravatar/gravatar /Users/dave/.emacs.d/el-get/nognus/lisp/gravatar hides /Users/dave/.emacs.d/el-get/wl-gravatar/gravatar /Users/dave/.emacs.d/el-get/package/elpa/weblogger-1.4.3/weblogger hides /Users/dave/.emacs.d/el-get/weblogger-el/weblogger /Users/dave/.emacs.d/el-get/nognus/lisp/.dir-locals hides /Users/dave/.emacs.d/el-get/org-mode/.dir-locals /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-mailto hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-mailto /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-complete hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-complete /Users/dave/.emacs.d/el-get/wanderlust/utils/wl-addrbook hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/wl-addrbook /Users/dave/.emacs.d/el-get/nognus/lisp/utf7 hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/utf7 /Users/dave/.emacs.d/el-get/wanderlust/utils/ssl hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/ssl /Users/dave/.emacs.d/el-get/wanderlust/utils/rfc2368 hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/rfc2368 /Users/dave/.emacs.d/el-get/wanderlust/utils/im-wl hides /Users/dave/.emacs.d/el-get/wanderlust/site-lisp/wl/im-wl /Users/dave/.emacs.d/el-get/nognus/lisp/smime hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/smime /Users/dave/.emacs.d/el-get/nognus/lisp/pgg hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp5 hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-pgp5 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-pgp /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-parse hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-parse /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-gpg hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-gpg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-def hides /Users/dave/.emacs.d/el-get/semi/site-lisp/semi/pgg-def /Users/dave/.emacs.d/el-get/nognus/lisp/sha1 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sha1 /Users/dave/.emacs.d/el-get/nognus/lisp/sasl hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-ntlm hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-digest hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-digest /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-cram hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/sasl-cram /Users/dave/.emacs.d/el-get/nognus/lisp/ntlm hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/md4 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/md4 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-md5 hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hmac-md5 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-def hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hmac-def /Users/dave/.emacs.d/el-get/nognus/lisp/hex-util hides /Users/dave/.emacs.d/el-get/flim/site-lisp/flim/hex-util /Users/dave/.emacs.d/el-get/nognus/lisp/.dir-locals hides /Users/dave/.emacs.d/el-get/magit/.dir-locals /Users/dave/.emacs.d/el-get/xcscope/xcscope hides /opt/local/share/emacs/site-lisp/xcscope /Users/dave/.emacs.d/el-get/cmake-mode/cmake-mode hides /opt/local/share/emacs/site-lisp/cmake-mode /Users/dave/.emacs.d/el-get/nognus/lisp/password-cache hides /opt/local/share/emacs/24.0.94/lisp/password-cache /Users/dave/.emacs.d/el-get/nognus/lisp/md4 hides /opt/local/share/emacs/24.0.94/lisp/md4 /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/ido hides /opt/local/share/emacs/24.0.94/lisp/ido /Users/dave/.emacs.d/el-get/nognus/lisp/hex-util hides /opt/local/share/emacs/24.0.94/lisp/hex-util /Users/dave/.emacs.d/el-get/nognus/lisp/format-spec hides /opt/local/share/emacs/24.0.94/lisp/format-spec /Users/dave/.emacs.d/el-get/nognus/lisp/color hides /opt/local/share/emacs/24.0.94/lisp/color /Users/dave/.emacs.d/el-get/nognus/lisp/dns-mode hides /opt/local/share/emacs/24.0.94/lisp/textmodes/dns-mode /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/compile hides /opt/local/share/emacs/24.0.94/lisp/progmodes/compile /Users/dave/.emacs.d/el-get/org-mode/lisp/org hides /opt/local/share/emacs/24.0.94/lisp/org/org /Users/dave/.emacs.d/el-get/org-mode/lisp/org-xoxo hides /opt/local/share/emacs/24.0.94/lisp/org/org-xoxo /Users/dave/.emacs.d/el-get/org-mode/lisp/org-wl hides /opt/local/share/emacs/24.0.94/lisp/org/org-wl /Users/dave/.emacs.d/el-get/org-mode/lisp/org-w3m hides /opt/local/share/emacs/24.0.94/lisp/org/org-w3m /Users/dave/.emacs.d/el-get/org-mode/lisp/org-vm hides /opt/local/share/emacs/24.0.94/lisp/org/org-vm /Users/dave/.emacs.d/el-get/org-mode/lisp/org-timer hides /opt/local/share/emacs/24.0.94/lisp/org/org-timer /Users/dave/.emacs.d/el-get/org-mode/lisp/org-taskjuggler hides /opt/local/share/emacs/24.0.94/lisp/org/org-taskjuggler /Users/dave/.emacs.d/el-get/org-mode/lisp/org-table hides /opt/local/share/emacs/24.0.94/lisp/org/org-table /Users/dave/.emacs.d/el-get/org-mode/lisp/org-src hides /opt/local/share/emacs/24.0.94/lisp/org/org-src /Users/dave/.emacs.d/el-get/org-mode/lisp/org-special-blocks hides /opt/local/share/emacs/24.0.94/lisp/org/org-special-blocks /Users/dave/.emacs.d/el-get/org-mode/lisp/org-rmail hides /opt/local/share/emacs/24.0.94/lisp/org/org-rmail /Users/dave/.emacs.d/el-get/org-mode/lisp/org-remember hides /opt/local/share/emacs/24.0.94/lisp/org/org-remember /Users/dave/.emacs.d/el-get/org-mode/lisp/org-publish hides /opt/local/share/emacs/24.0.94/lisp/org/org-publish /Users/dave/.emacs.d/el-get/org-mode/lisp/org-protocol hides /opt/local/share/emacs/24.0.94/lisp/org/org-protocol /Users/dave/.emacs.d/el-get/org-mode/lisp/org-plot hides /opt/local/share/emacs/24.0.94/lisp/org/org-plot /Users/dave/.emacs.d/el-get/org-mode/lisp/org-pcomplete hides /opt/local/share/emacs/24.0.94/lisp/org/org-pcomplete /Users/dave/.emacs.d/el-get/org-mode/lisp/org-odt hides /opt/local/share/emacs/24.0.94/lisp/org/org-odt /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mouse hides /opt/local/share/emacs/24.0.94/lisp/org/org-mouse /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mobile hides /opt/local/share/emacs/24.0.94/lisp/org/org-mobile /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mks hides /opt/local/share/emacs/24.0.94/lisp/org/org-mks /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mhe hides /opt/local/share/emacs/24.0.94/lisp/org/org-mhe /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mew hides /opt/local/share/emacs/24.0.94/lisp/org/org-mew /Users/dave/.emacs.d/el-get/org-mode/lisp/org-macs hides /opt/local/share/emacs/24.0.94/lisp/org/org-macs /Users/dave/.emacs.d/el-get/org-mode/lisp/org-mac-message hides /opt/local/share/emacs/24.0.94/lisp/org/org-mac-message /Users/dave/.emacs.d/el-get/org-mode/lisp/org-lparse hides /opt/local/share/emacs/24.0.94/lisp/org/org-lparse /Users/dave/.emacs.d/el-get/org-mode/lisp/org-list hides /opt/local/share/emacs/24.0.94/lisp/org/org-list /Users/dave/.emacs.d/el-get/org-mode/lisp/org-latex hides /opt/local/share/emacs/24.0.94/lisp/org/org-latex /Users/dave/.emacs.d/el-get/org-mode/lisp/org-jsinfo hides /opt/local/share/emacs/24.0.94/lisp/org/org-jsinfo /Users/dave/.emacs.d/el-get/org-mode/lisp/org-irc hides /opt/local/share/emacs/24.0.94/lisp/org/org-irc /Users/dave/.emacs.d/el-get/org-mode/lisp/org-install hides /opt/local/share/emacs/24.0.94/lisp/org/org-install /Users/dave/.emacs.d/el-get/org-mode/lisp/org-inlinetask hides /opt/local/share/emacs/24.0.94/lisp/org/org-inlinetask /Users/dave/.emacs.d/el-get/org-mode/lisp/org-info hides /opt/local/share/emacs/24.0.94/lisp/org/org-info /Users/dave/.emacs.d/el-get/org-mode/lisp/org-indent hides /opt/local/share/emacs/24.0.94/lisp/org/org-indent /Users/dave/.emacs.d/el-get/org-mode/lisp/org-id hides /opt/local/share/emacs/24.0.94/lisp/org/org-id /Users/dave/.emacs.d/el-get/org-mode/lisp/org-icalendar hides /opt/local/share/emacs/24.0.94/lisp/org/org-icalendar /Users/dave/.emacs.d/el-get/org-mode/lisp/org-html hides /opt/local/share/emacs/24.0.94/lisp/org/org-html /Users/dave/.emacs.d/el-get/org-mode/lisp/org-habit hides /opt/local/share/emacs/24.0.94/lisp/org/org-habit /Users/dave/.emacs.d/el-get/org-mode/lisp/org-gnus hides /opt/local/share/emacs/24.0.94/lisp/org/org-gnus /Users/dave/.emacs.d/el-get/org-mode/lisp/org-freemind hides /opt/local/share/emacs/24.0.94/lisp/org/org-freemind /Users/dave/.emacs.d/el-get/org-mode/lisp/org-footnote hides /opt/local/share/emacs/24.0.94/lisp/org/org-footnote /Users/dave/.emacs.d/el-get/org-mode/lisp/org-feed hides /opt/local/share/emacs/24.0.94/lisp/org/org-feed /Users/dave/.emacs.d/el-get/org-mode/lisp/org-faces hides /opt/local/share/emacs/24.0.94/lisp/org/org-faces /Users/dave/.emacs.d/el-get/org-mode/lisp/org-exp hides /opt/local/share/emacs/24.0.94/lisp/org/org-exp /Users/dave/.emacs.d/el-get/org-mode/lisp/org-exp-blocks hides /opt/local/share/emacs/24.0.94/lisp/org/org-exp-blocks /Users/dave/.emacs.d/el-get/org-mode/lisp/org-eshell hides /opt/local/share/emacs/24.0.94/lisp/org/org-eshell /Users/dave/.emacs.d/el-get/org-mode/lisp/org-entities hides /opt/local/share/emacs/24.0.94/lisp/org/org-entities /Users/dave/.emacs.d/el-get/org-mode/lisp/org-docview hides /opt/local/share/emacs/24.0.94/lisp/org/org-docview /Users/dave/.emacs.d/el-get/org-mode/lisp/org-docbook hides /opt/local/share/emacs/24.0.94/lisp/org/org-docbook /Users/dave/.emacs.d/el-get/org-mode/lisp/org-datetree hides /opt/local/share/emacs/24.0.94/lisp/org/org-datetree /Users/dave/.emacs.d/el-get/org-mode/lisp/org-ctags hides /opt/local/share/emacs/24.0.94/lisp/org/org-ctags /Users/dave/.emacs.d/el-get/org-mode/lisp/org-crypt hides /opt/local/share/emacs/24.0.94/lisp/org/org-crypt /Users/dave/.emacs.d/el-get/org-mode/lisp/org-compat hides /opt/local/share/emacs/24.0.94/lisp/org/org-compat /Users/dave/.emacs.d/el-get/org-mode/lisp/org-colview hides /opt/local/share/emacs/24.0.94/lisp/org/org-colview /Users/dave/.emacs.d/el-get/org-mode/lisp/org-clock hides /opt/local/share/emacs/24.0.94/lisp/org/org-clock /Users/dave/.emacs.d/el-get/org-mode/lisp/org-capture hides /opt/local/share/emacs/24.0.94/lisp/org/org-capture /Users/dave/.emacs.d/el-get/org-mode/lisp/org-bibtex hides /opt/local/share/emacs/24.0.94/lisp/org/org-bibtex /Users/dave/.emacs.d/el-get/org-mode/lisp/org-beamer hides /opt/local/share/emacs/24.0.94/lisp/org/org-beamer /Users/dave/.emacs.d/el-get/org-mode/lisp/org-bbdb hides /opt/local/share/emacs/24.0.94/lisp/org/org-bbdb /Users/dave/.emacs.d/el-get/org-mode/lisp/org-attach hides /opt/local/share/emacs/24.0.94/lisp/org/org-attach /Users/dave/.emacs.d/el-get/org-mode/lisp/org-ascii hides /opt/local/share/emacs/24.0.94/lisp/org/org-ascii /Users/dave/.emacs.d/el-get/org-mode/lisp/org-archive hides /opt/local/share/emacs/24.0.94/lisp/org/org-archive /Users/dave/.emacs.d/el-get/org-mode/lisp/org-agenda hides /opt/local/share/emacs/24.0.94/lisp/org/org-agenda /Users/dave/.emacs.d/el-get/org-mode/lisp/ob hides /opt/local/share/emacs/24.0.94/lisp/org/ob /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-tangle hides /opt/local/share/emacs/24.0.94/lisp/org/ob-tangle /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-table hides /opt/local/share/emacs/24.0.94/lisp/org/ob-table /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-sqlite hides /opt/local/share/emacs/24.0.94/lisp/org/ob-sqlite /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-sql hides /opt/local/share/emacs/24.0.94/lisp/org/ob-sql /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-shen hides /opt/local/share/emacs/24.0.94/lisp/org/ob-shen /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-sh hides /opt/local/share/emacs/24.0.94/lisp/org/ob-sh /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-screen hides /opt/local/share/emacs/24.0.94/lisp/org/ob-screen /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-scheme hides /opt/local/share/emacs/24.0.94/lisp/org/ob-scheme /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-sass hides /opt/local/share/emacs/24.0.94/lisp/org/ob-sass /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-ruby hides /opt/local/share/emacs/24.0.94/lisp/org/ob-ruby /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-ref hides /opt/local/share/emacs/24.0.94/lisp/org/ob-ref /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-R hides /opt/local/share/emacs/24.0.94/lisp/org/ob-R /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-python hides /opt/local/share/emacs/24.0.94/lisp/org/ob-python /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-plantuml hides /opt/local/share/emacs/24.0.94/lisp/org/ob-plantuml /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-picolisp hides /opt/local/share/emacs/24.0.94/lisp/org/ob-picolisp /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-perl hides /opt/local/share/emacs/24.0.94/lisp/org/ob-perl /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-org hides /opt/local/share/emacs/24.0.94/lisp/org/ob-org /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-octave hides /opt/local/share/emacs/24.0.94/lisp/org/ob-octave /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-ocaml hides /opt/local/share/emacs/24.0.94/lisp/org/ob-ocaml /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-mscgen hides /opt/local/share/emacs/24.0.94/lisp/org/ob-mscgen /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-maxima hides /opt/local/share/emacs/24.0.94/lisp/org/ob-maxima /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-matlab hides /opt/local/share/emacs/24.0.94/lisp/org/ob-matlab /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-lob hides /opt/local/share/emacs/24.0.94/lisp/org/ob-lob /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-lisp hides /opt/local/share/emacs/24.0.94/lisp/org/ob-lisp /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-lilypond hides /opt/local/share/emacs/24.0.94/lisp/org/ob-lilypond /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-ledger hides /opt/local/share/emacs/24.0.94/lisp/org/ob-ledger /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-latex hides /opt/local/share/emacs/24.0.94/lisp/org/ob-latex /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-keys hides /opt/local/share/emacs/24.0.94/lisp/org/ob-keys /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-js hides /opt/local/share/emacs/24.0.94/lisp/org/ob-js /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-java hides /opt/local/share/emacs/24.0.94/lisp/org/ob-java /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-haskell hides /opt/local/share/emacs/24.0.94/lisp/org/ob-haskell /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-gnuplot hides /opt/local/share/emacs/24.0.94/lisp/org/ob-gnuplot /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-fortran hides /opt/local/share/emacs/24.0.94/lisp/org/ob-fortran /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-exp hides /opt/local/share/emacs/24.0.94/lisp/org/ob-exp /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-eval hides /opt/local/share/emacs/24.0.94/lisp/org/ob-eval /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-emacs-lisp hides /opt/local/share/emacs/24.0.94/lisp/org/ob-emacs-lisp /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-dot hides /opt/local/share/emacs/24.0.94/lisp/org/ob-dot /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-ditaa hides /opt/local/share/emacs/24.0.94/lisp/org/ob-ditaa /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-css hides /opt/local/share/emacs/24.0.94/lisp/org/ob-css /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-comint hides /opt/local/share/emacs/24.0.94/lisp/org/ob-comint /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-clojure hides /opt/local/share/emacs/24.0.94/lisp/org/ob-clojure /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-calc hides /opt/local/share/emacs/24.0.94/lisp/org/ob-calc /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-C hides /opt/local/share/emacs/24.0.94/lisp/org/ob-C /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-awk hides /opt/local/share/emacs/24.0.94/lisp/org/ob-awk /Users/dave/.emacs.d/el-get/org-mode/lisp/ob-asymptote hides /opt/local/share/emacs/24.0.94/lisp/org/ob-asymptote /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/trampver hides /opt/local/share/emacs/24.0.94/lisp/net/trampver /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp hides /opt/local/share/emacs/24.0.94/lisp/net/tramp /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-uu hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-uu /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-smb hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-smb /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-sh hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-sh /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-loaddefs hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-loaddefs /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-gw hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-gw /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-ftp hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-ftp /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-compat hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-compat /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-cmds hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-cmds /Users/dave/.emacs.d/el-get/tramp/share/emacs/site-lisp/tramp-cache hides /opt/local/share/emacs/24.0.94/lisp/net/tramp-cache /Users/dave/.emacs.d/el-get/nognus/lisp/tls hides /opt/local/share/emacs/24.0.94/lisp/net/tls /Users/dave/.emacs.d/el-get/nognus/lisp/sasl hides /opt/local/share/emacs/24.0.94/lisp/net/sasl /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-ntlm hides /opt/local/share/emacs/24.0.94/lisp/net/sasl-ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-digest hides /opt/local/share/emacs/24.0.94/lisp/net/sasl-digest /Users/dave/.emacs.d/el-get/nognus/lisp/sasl-cram hides /opt/local/share/emacs/24.0.94/lisp/net/sasl-cram /Users/dave/.emacs.d/el-get/nognus/lisp/ntlm hides /opt/local/share/emacs/24.0.94/lisp/net/ntlm /Users/dave/.emacs.d/el-get/nognus/lisp/netrc hides /opt/local/share/emacs/24.0.94/lisp/net/netrc /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-md5 hides /opt/local/share/emacs/24.0.94/lisp/net/hmac-md5 /Users/dave/.emacs.d/el-get/nognus/lisp/hmac-def hides /opt/local/share/emacs/24.0.94/lisp/net/hmac-def /Users/dave/.emacs.d/el-get/nognus/lisp/dns hides /opt/local/share/emacs/24.0.94/lisp/net/dns /Users/dave/.emacs.d/el-get/nognus/lisp/dig hides /opt/local/share/emacs/24.0.94/lisp/net/dig /Users/dave/.emacs.d/el-get/nognus/lisp/uudecode hides /opt/local/share/emacs/24.0.94/lisp/mail/uudecode /Users/dave/.emacs.d/el-get/wanderlust/utils/rfc2368 hides /opt/local/share/emacs/24.0.94/lisp/mail/rfc2368 /Users/dave/.emacs.d/el-get/nognus/lisp/hashcash hides /opt/local/share/emacs/24.0.94/lisp/mail/hashcash /Users/dave/.emacs.d/el-get/nognus/lisp/binhex hides /opt/local/share/emacs/24.0.94/lisp/mail/binhex /Users/dave/.emacs.d/el-get/nognus/lisp/yenc hides /opt/local/share/emacs/24.0.94/lisp/gnus/yenc /Users/dave/.emacs.d/el-get/nognus/lisp/utf7 hides /opt/local/share/emacs/24.0.94/lisp/gnus/utf7 /Users/dave/.emacs.d/el-get/nognus/lisp/starttls hides /opt/local/share/emacs/24.0.94/lisp/gnus/starttls /Users/dave/.emacs.d/el-get/nognus/lisp/spam hides /opt/local/share/emacs/24.0.94/lisp/gnus/spam /Users/dave/.emacs.d/el-get/nognus/lisp/spam-wash hides /opt/local/share/emacs/24.0.94/lisp/gnus/spam-wash /Users/dave/.emacs.d/el-get/nognus/lisp/spam-stat hides /opt/local/share/emacs/24.0.94/lisp/gnus/spam-stat /Users/dave/.emacs.d/el-get/nognus/lisp/spam-report hides /opt/local/share/emacs/24.0.94/lisp/gnus/spam-report /Users/dave/.emacs.d/el-get/nognus/lisp/smime hides /opt/local/share/emacs/24.0.94/lisp/gnus/smime /Users/dave/.emacs.d/el-get/nognus/lisp/smiley hides /opt/local/share/emacs/24.0.94/lisp/gnus/smiley /Users/dave/.emacs.d/el-get/nognus/lisp/sieve hides /opt/local/share/emacs/24.0.94/lisp/gnus/sieve /Users/dave/.emacs.d/el-get/nognus/lisp/sieve-mode hides /opt/local/share/emacs/24.0.94/lisp/gnus/sieve-mode /Users/dave/.emacs.d/el-get/nognus/lisp/sieve-manage hides /opt/local/share/emacs/24.0.94/lisp/gnus/sieve-manage /Users/dave/.emacs.d/el-get/nognus/lisp/shr hides /opt/local/share/emacs/24.0.94/lisp/gnus/shr /Users/dave/.emacs.d/el-get/nognus/lisp/shr-color hides /opt/local/share/emacs/24.0.94/lisp/gnus/shr-color /Users/dave/.emacs.d/el-get/nognus/lisp/score-mode hides /opt/local/share/emacs/24.0.94/lisp/gnus/score-mode /Users/dave/.emacs.d/el-get/nognus/lisp/rtree hides /opt/local/share/emacs/24.0.94/lisp/gnus/rtree /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2231 hides /opt/local/share/emacs/24.0.94/lisp/gnus/rfc2231 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2104 hides /opt/local/share/emacs/24.0.94/lisp/gnus/rfc2104 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2047 hides /opt/local/share/emacs/24.0.94/lisp/gnus/rfc2047 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc2045 hides /opt/local/share/emacs/24.0.94/lisp/gnus/rfc2045 /Users/dave/.emacs.d/el-get/nognus/lisp/rfc1843 hides /opt/local/share/emacs/24.0.94/lisp/gnus/rfc1843 /Users/dave/.emacs.d/el-get/nognus/lisp/registry hides /opt/local/share/emacs/24.0.94/lisp/gnus/registry /Users/dave/.emacs.d/el-get/nognus/lisp/qp hides /opt/local/share/emacs/24.0.94/lisp/gnus/qp /Users/dave/.emacs.d/el-get/nognus/lisp/pop3 hides /opt/local/share/emacs/24.0.94/lisp/gnus/pop3 /Users/dave/.emacs.d/el-get/nognus/lisp/plstore hides /opt/local/share/emacs/24.0.94/lisp/gnus/plstore /Users/dave/.emacs.d/el-get/nognus/lisp/nnweb hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnweb /Users/dave/.emacs.d/el-get/nognus/lisp/nnvirtual hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnvirtual /Users/dave/.emacs.d/el-get/nognus/lisp/nntp hides /opt/local/share/emacs/24.0.94/lisp/gnus/nntp /Users/dave/.emacs.d/el-get/nognus/lisp/nnspool hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnspool /Users/dave/.emacs.d/el-get/nognus/lisp/nnrss hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnrss /Users/dave/.emacs.d/el-get/nognus/lisp/nnregistry hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnregistry /Users/dave/.emacs.d/el-get/nognus/lisp/nnoo hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnoo /Users/dave/.emacs.d/el-get/nognus/lisp/nnnil hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnnil /Users/dave/.emacs.d/el-get/nognus/lisp/nnml hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnml /Users/dave/.emacs.d/el-get/nognus/lisp/nnmh hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnmh /Users/dave/.emacs.d/el-get/nognus/lisp/nnmbox hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnmbox /Users/dave/.emacs.d/el-get/nognus/lisp/nnmairix hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnmairix /Users/dave/.emacs.d/el-get/nognus/lisp/nnmaildir hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnmaildir /Users/dave/.emacs.d/el-get/nognus/lisp/nnmail hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnmail /Users/dave/.emacs.d/el-get/nognus/lisp/nnir hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnir /Users/dave/.emacs.d/el-get/nognus/lisp/nnimap hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnimap /Users/dave/.emacs.d/el-get/nognus/lisp/nnheader hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnheader /Users/dave/.emacs.d/el-get/nognus/lisp/nngateway hides /opt/local/share/emacs/24.0.94/lisp/gnus/nngateway /Users/dave/.emacs.d/el-get/nognus/lisp/nnfolder hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnfolder /Users/dave/.emacs.d/el-get/nognus/lisp/nneething hides /opt/local/share/emacs/24.0.94/lisp/gnus/nneething /Users/dave/.emacs.d/el-get/nognus/lisp/nndraft hides /opt/local/share/emacs/24.0.94/lisp/gnus/nndraft /Users/dave/.emacs.d/el-get/nognus/lisp/nndoc hides /opt/local/share/emacs/24.0.94/lisp/gnus/nndoc /Users/dave/.emacs.d/el-get/nognus/lisp/nndir hides /opt/local/share/emacs/24.0.94/lisp/gnus/nndir /Users/dave/.emacs.d/el-get/nognus/lisp/nndiary hides /opt/local/share/emacs/24.0.94/lisp/gnus/nndiary /Users/dave/.emacs.d/el-get/nognus/lisp/nnbabyl hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnbabyl /Users/dave/.emacs.d/el-get/nognus/lisp/nnagent hides /opt/local/share/emacs/24.0.94/lisp/gnus/nnagent /Users/dave/.emacs.d/el-get/nognus/lisp/mml2015 hides /opt/local/share/emacs/24.0.94/lisp/gnus/mml2015 /Users/dave/.emacs.d/el-get/nognus/lisp/mml1991 hides /opt/local/share/emacs/24.0.94/lisp/gnus/mml1991 /Users/dave/.emacs.d/el-get/nognus/lisp/mml hides /opt/local/share/emacs/24.0.94/lisp/gnus/mml /Users/dave/.emacs.d/el-get/nognus/lisp/mml-smime hides /opt/local/share/emacs/24.0.94/lisp/gnus/mml-smime /Users/dave/.emacs.d/el-get/nognus/lisp/mml-sec hides /opt/local/share/emacs/24.0.94/lisp/gnus/mml-sec /Users/dave/.emacs.d/el-get/nognus/lisp/mm-view hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-view /Users/dave/.emacs.d/el-get/nognus/lisp/mm-uu hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-uu /Users/dave/.emacs.d/el-get/nognus/lisp/mm-util hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-util /Users/dave/.emacs.d/el-get/nognus/lisp/mm-url hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-url /Users/dave/.emacs.d/el-get/nognus/lisp/mm-partial hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-partial /Users/dave/.emacs.d/el-get/nognus/lisp/mm-extern hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-extern /Users/dave/.emacs.d/el-get/nognus/lisp/mm-encode hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-encode /Users/dave/.emacs.d/el-get/nognus/lisp/mm-decode hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-decode /Users/dave/.emacs.d/el-get/nognus/lisp/mm-bodies hides /opt/local/share/emacs/24.0.94/lisp/gnus/mm-bodies /Users/dave/.emacs.d/el-get/nognus/lisp/messcompat hides /opt/local/share/emacs/24.0.94/lisp/gnus/messcompat /Users/dave/.emacs.d/el-get/nognus/lisp/message hides /opt/local/share/emacs/24.0.94/lisp/gnus/message /Users/dave/.emacs.d/el-get/nognus/lisp/mailcap hides /opt/local/share/emacs/24.0.94/lisp/gnus/mailcap /Users/dave/.emacs.d/el-get/nognus/lisp/mail-source hides /opt/local/share/emacs/24.0.94/lisp/gnus/mail-source /Users/dave/.emacs.d/el-get/nognus/lisp/mail-prsvr hides /opt/local/share/emacs/24.0.94/lisp/gnus/mail-prsvr /Users/dave/.emacs.d/el-get/nognus/lisp/mail-parse hides /opt/local/share/emacs/24.0.94/lisp/gnus/mail-parse /Users/dave/.emacs.d/el-get/nognus/lisp/legacy-gnus-agent hides /opt/local/share/emacs/24.0.94/lisp/gnus/legacy-gnus-agent /Users/dave/.emacs.d/el-get/nognus/lisp/ietf-drums hides /opt/local/share/emacs/24.0.94/lisp/gnus/ietf-drums /Users/dave/.emacs.d/el-get/nognus/lisp/html2text hides /opt/local/share/emacs/24.0.94/lisp/gnus/html2text /Users/dave/.emacs.d/el-get/nognus/lisp/gssapi hides /opt/local/share/emacs/24.0.94/lisp/gnus/gssapi /Users/dave/.emacs.d/el-get/nognus/lisp/gravatar hides /opt/local/share/emacs/24.0.94/lisp/gnus/gravatar /Users/dave/.emacs.d/el-get/nognus/lisp/gnus hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-win hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-win /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-vm hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-vm /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-uu hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-uu /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-util hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-util /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-undo hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-undo /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-topic hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-topic /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-sync hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-sync /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-sum hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-sum /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-start hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-start /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-srvr hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-srvr /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-spec hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-spec /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-sieve hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-sieve /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-setup hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-setup /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-score hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-score /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-salt hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-salt /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-registry hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-registry /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-range hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-range /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-picon hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-picon /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-msg hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-msg /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-mlspl hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-mlspl /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-ml hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-ml /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-mh hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-mh /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-logic hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-logic /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-kill hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-kill /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-int hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-int /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-html hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-html /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-group hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-group /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-gravatar hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-gravatar /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-fun hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-fun /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-ems hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-ems /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-eform hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-eform /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-dup hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-dup /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-draft hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-draft /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-dired hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-dired /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-diary hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-diary /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-demon hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-demon /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-delay hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-delay /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cus hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-cus /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cite hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-cite /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-cache hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-cache /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-bookmark hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-bookmark /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-bcklg hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-bcklg /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-async hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-async /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-art hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-art /Users/dave/.emacs.d/el-get/nognus/lisp/gnus-agent hides /opt/local/share/emacs/24.0.94/lisp/gnus/gnus-agent /Users/dave/.emacs.d/el-get/nognus/lisp/gmm-utils hides /opt/local/share/emacs/24.0.94/lisp/gnus/gmm-utils /Users/dave/.emacs.d/el-get/nognus/lisp/flow-fill hides /opt/local/share/emacs/24.0.94/lisp/gnus/flow-fill /Users/dave/.emacs.d/el-get/nognus/lisp/ecomplete hides /opt/local/share/emacs/24.0.94/lisp/gnus/ecomplete /Users/dave/.emacs.d/el-get/nognus/lisp/deuglify hides /opt/local/share/emacs/24.0.94/lisp/gnus/deuglify /Users/dave/.emacs.d/el-get/nognus/lisp/compface hides /opt/local/share/emacs/24.0.94/lisp/gnus/compface /Users/dave/.emacs.d/el-get/nognus/lisp/canlock hides /opt/local/share/emacs/24.0.94/lisp/gnus/canlock /Users/dave/.emacs.d/el-get/nognus/lisp/auth-source hides /opt/local/share/emacs/24.0.94/lisp/gnus/auth-source /Users/dave/.emacs.d/el-get/nognus/lisp/.dir-locals hides /opt/local/share/emacs/24.0.94/lisp/gnus/.dir-locals /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/ert hides /opt/local/share/emacs/24.0.94/lisp/emacs-lisp/ert /Users/dave/.emacs.d/el-get/dwamacs/site-lisp/ert-x hides /opt/local/share/emacs/24.0.94/lisp/emacs-lisp/ert-x /Users/dave/.emacs.d/el-get/nognus/lisp/time-date hides /opt/local/share/emacs/24.0.94/lisp/calendar/time-date /Users/dave/.emacs.d/el-get/nognus/lisp/parse-time hides /opt/local/share/emacs/24.0.94/lisp/calendar/parse-time /Users/dave/.emacs.d/el-get/nognus/lisp/pgg hides /opt/local/share/emacs/24.0.94/lisp/obsolete/pgg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp5 hides /opt/local/share/emacs/24.0.94/lisp/obsolete/pgg-pgp5 /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-pgp hides /opt/local/share/emacs/24.0.94/lisp/obsolete/pgg-pgp /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-parse hides /opt/local/share/emacs/24.0.94/lisp/obsolete/pgg-parse /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-gpg hides /opt/local/share/emacs/24.0.94/lisp/obsolete/pgg-gpg /Users/dave/.emacs.d/el-get/nognus/lisp/pgg-def hides /opt/local/share/emacs/24.0.94/lisp/obsolete/pgg-def Features: (shadow emacsbug log-view conf-mode tramp-cache tramp-sh tabify man dabbrev recentf tree-widget nxml-uchnm rng-xsd xsd-regexp rng-cmpct rng-nxml rng-valid rng-loc rng-uri rng-parse nxml-parse rng-match rng-dt rng-util rng-pttrn nxml-ns nxml-mode nxml-outln nxml-rap nxml-util nxml-glyph nxml-enc xmltok vc-annotate vc ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff vc-dispatcher dired-aux ede/dired gnus-dired diff multi-isearch smerge-mode sh-script canlock vc-git python-21 python unsafep hl-line find-dired grep+ grep-ed hilit-chg grep compile+ compile compile- magit-bisect magit-key-mode magit diff-mode log-edit pcvs-util newcomment dot-org-el org-checklist ob-sh ob-python ob-R ox-redmine ox-org org-x ox-plugin org-devonthink org-habit org-agenda org-info org-id org ob-emacs-lisp ob-tangle ob-ref ob-lob ob-table org-footnote org-src ob-comint ob-keys ob ob-eval org-pcomplete org-list org-faces org-compat org-entities org-macs noutline outline cal-menu calendar cal-loaddefs smiley url-http url-auth url-gw sort shr-color color mule-util qp shr gnus-async gnus-bcklg gnus-salt gnus-dup gnus-ml gnus-topic utf-7 nndraft nnmh nnfolder epa-file epa epg network-stream nnimap parse-time tls utf7 netrc gnus-agent gnus-srvr gnus-score score-mode nnvirtual nntp gnus-cache dot-gnus-el mail-settings gnus-cite w3m-load spam spam-stat gnus-uu yenc gnus-msg gnus-gravatar mail-extr gravatar url-cache gnus-registry registry gnus-art mm-uu mml2015 epg-config mm-view mml-smime smime dig gnus-sum nnoo gnus-group gnus-undo nnmail mail-source gnus-start gnus-spec gnus-win gnus-int gnus-range pgg pgg-parse pgg-def starttls gnus-harvest message idna rfc822 mml mml-sec mm-decode mm-archive mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader mailalias sendmail rfc2047 rfc2045 ietf-drums gnus gnus-ems gnus-compat url url-proxy url-privacy url-expand url-methods url-history url-cookie url-util url-parse url-vars mailcap nnheader mail-utils company-autoloads weblogger-autoloads xml-rpc-autoloads maxframe session warnings per-window-point page-ext disp-table pp-c-l ws-trim ffap info+ fit-frame strings misc-fns thingatpt+ osx-plist xml dot-passwd-el .loaddefs eproject-extras ibuf-macs ibuf-ext ibuffer iswitchb eproject esh-var esh-io esh-cmd esh-ext esh-proc esh-arg eldoc esh-groups eshell esh-module esh-mode esh-util diminish workgroups tramp tramp-compat auth-source gnus-util mm-util mail-prsvr password-cache format-spec tramp-loaddefs ess-toolbar ess-mouse mouseme browse-url ess-menu ess-swv ess-noweb noweb-font-lock-mode ess-bugs-l essd-els ess-sas-d ess-sas-l ess-sas-a executable shell pcomplete ess-arc-d ess-vst-d ess-xls-d ess-lsp-l ess-sta-d ess-sta-l make-regexp ess-sp6-d ess-sp5-d ess-sp3-d ess-r-d ess-r-args ess-s-l ess-inf ess-utils comint ansi-color ess-mode noweb-mode ess ess-custom ess-compat ess-site xcscope cmake-mode thingatpt mo-git-blame php-mode add-log etags ring cc-langs cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs gnus-load yasnippet dropdown-list derived edmacro kmacro org-install initsplit advice advice-preload find-func el-get el-get-autoloads el-get-list-packages el-get-notify help-mode view el-get-dependencies el-get-build el-get-byte-compile el-get-status el-get-recipes el-get-methods el-get-svn el-get-pacman el-get-http-zip el-get-http-tar el-get-hg el-get-git-svn el-get-fink el-get-emacswiki el-get-http el-get-emacsmirror el-get-git el-get-elpa package tabulated-list el-get-darcs el-get-cvs el-get-bzr el-get-brew el-get-builtin el-get-apt-get el-get-custom el-get-core autoload help-fns cl dired-x dired regexp-opt jka-compr info ede/linux ede/emacs ede/cpp-root paren server ido easy-mmode ede/speedbar ede/files ede ede/base ede/auto ede/source eieio-base eieio-speedbar speedbar sb-image ezimage dframe easymenu assoc eieio-custom wid-edit eieio byte-opt bytecomp byte-compile cconv macroexp cedet autorevert time delsel cus-start cus-load elhome time-date tooltip ediff-hook vc-hooks lisp-float-type mwheel mac-win tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer loaddefs button faces cus-face files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote mac multi-tty make-network-process emacs) -- Dave Abrahams BoostPro Computing http://www.boostpro.com --=-=-=-- ------------=_1355498703-19694-5-- From unknown Sun Jun 22 04:08:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.428 (Entity 5.428) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Dave Abrahams Subject: bug#11318: closed (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> X-Gnu-PR-Message: they-closed 11318 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 11318@debbugs.gnu.org Date: Fri, 14 Dec 2012 15:25:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1355498704-19694-7" This is a multi-part message in MIME format... ------------=_1355498704-19694-7 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #11319: [Patchset] A bugfix and an arguable bugfix for ediff-inferior-compa= re-regions which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 11318@debbugs.gnu.org. --=20 11319: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D11319 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1355498704-19694-7 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 ------------=_1355498704-19694-7 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 23 Apr 2012 19:29:37 +0000 Received: from localhost ([127.0.0.1]:49416 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SMOx6-0002dz-Et for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:29:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44127) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SMOx4-0002dl-Ce for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:29:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMOwG-0004t1-W5 for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:28:46 -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]:44548) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwG-0004sx-Sy for submit@debbugs.gnu.org; Mon, 23 Apr 2012 15:28:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SMOwF-0001FN-7E for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SMOwD-0004sX-C7 for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:42 -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 1SMOwD-0004sI-8F for bug-gnu-emacs@gnu.org; Mon, 23 Apr 2012 15:28:41 -0400 Received: by qabg27 with SMTP id g27so55601qab.14 for ; Mon, 23 Apr 2012 12:28:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:x-gm-message-state; bh=kZhfCG8+Tjlc4Yp4NcKAq4KHq0LMNk/hKobTobkQE4o=; b=SvX5+BoyS2z1b0X0UCd+AIVR4E16TPv0E2++EcqnyZKUvl7JeT6m8VYVh0t8IbiKZj 75Oml8oekZZeYq9gYZ+0f6wvVOj7yBpm7lkgUzU9XVck6zqmXg+YFmmoOmLbpF2BZm2F mvQvhjUE+4GvQdorW+zAjwc9uogB9wfZHxHFH+GvyRGD61Suzsq+KHZiNZW7R9UMHqsi tCfdZNcznS0oE5hyNHRmronyZX5ZbD6f0lnHDcMs7AB+eWENR/lVUsDG7NbcDTo1JcwF tLX81ZrvlxoQuJYovejfRr6KFzoCo60KvB0uGWPgS3sCKxW9rmJ6dTXNPf/EOkeE0IHB geXg== Received: by 10.229.111.79 with SMTP id r15mr4543449qcp.3.1335209318279; Mon, 23 Apr 2012 12:28:38 -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 ha3sm23151645qab.13.2012.04.23.12.28.37 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Apr 2012 12:28:37 -0700 (PDT) Received: by pluto.local (Postfix, from userid 501) id CFB393386B19; Mon, 23 Apr 2012 15:28:36 -0400 (EDT) From: Dave Abrahams To: bug-gnu-emacs@gnu.org Subject: [Patchset] A bugfix and an arguable bugfix for ediff-inferior-compare-regions Date: Mon, 23 Apr 2012 15:28:24 -0400 Message-Id: <1335209306-81494-1-git-send-email-dave@boostpro.com> X-Mailer: git-send-email 1.7.10 X-Gm-Message-State: ALoCoQmGF+aT3Sb13D9q+tNmV6Mk12XqooO2E4Eze96znl3ldlVJ9IzUyIkXZ5BgVzdRGpBR6hFI 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 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 (------) These patches apply against the emacs-24 branch from 2012-04-23 15:26:22 EST The first one is definitely a bugfix. The second one depends on the first and corrects a behavior that I consider to be buggy, though others may disagree. [PATCH 1/2] BUGFIX: select current-diff-comparison regions for [PATCH 2/2] Useful behavior for ediff-inferior-compare-regions when ------------=_1355498704-19694-7-- From unknown Sun Jun 22 04:08:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Resent-From: Dave Abrahams Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Dec 2012 17:18:01 +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 To: Stefan Monnier Cc: Michael Kifer , 11319-done@debbugs.gnu.org Received: via spool by 11319-done@debbugs.gnu.org id=D11319.135550547829686 (code D ref 11319); Fri, 14 Dec 2012 17:18:01 +0000 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 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-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 unknown Sun Jun 22 04:08:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly 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 To: Dave Abrahams Cc: 11319-done@debbugs.gnu.org, Stefan Monnier Received: via spool by 11319-done@debbugs.gnu.org id=D11319.135555955819766 (code D ref 11319); Sat, 15 Dec 2012 08:20:02 +0000 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 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-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 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 unknown Sun Jun 22 04:08:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Resent-From: Dave Abrahams Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 17 Dec 2012 23:24: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 To: Michael Kifer Cc: 11319-done@debbugs.gnu.org, Stefan Monnier Received: via spool by 11319-done@debbugs.gnu.org id=D11319.135578662732087 (code D ref 11319); Mon, 17 Dec 2012 23:24:02 +0000 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 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-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 unknown Sun Jun 22 04:08:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly 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 To: Dave Abrahams Cc: 11319-done@debbugs.gnu.org, Stefan Monnier Received: via spool by 11319-done@debbugs.gnu.org id=D11319.135578702632718 (code D ref 11319); Mon, 17 Dec 2012 23:31:02 +0000 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 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-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 unknown Sun Jun 22 04:08:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Resent-From: Dave Abrahams Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 17 Dec 2012 23:46:01 +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 To: Michael Kifer Cc: 11319-done@debbugs.gnu.org, Stefan Monnier Received: via spool by 11319-done@debbugs.gnu.org id=D11319.13557879581745 (code D ref 11319); Mon, 17 Dec 2012 23:46:01 +0000 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 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-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 unknown Sun Jun 22 04:08:53 2025 X-Loop: help-debbugs@gnu.org Subject: bug#11319: [PATCH 1/2] BUGFIX: select current-diff-comparison regions for ediff-inferior-compare-regions correctly Resent-From: Michael Kifer Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 18 Dec 2012 00:04:01 +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 To: Dave Abrahams Cc: 11319-done@debbugs.gnu.org, Stefan Monnier Received: via spool by 11319-done@debbugs.gnu.org id=D11319.13557890013319 (code D ref 11319); Tue, 18 Dec 2012 00:04:01 +0000 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 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-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.