From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: bojohan+news@dd.chalmers.se (Johan =?utf-8?Q?Bockg=C3=A5rd?=) Newsgroups: gmane.emacs.devel Subject: Re: 23.0.50; Diff refinement Date: Wed, 07 Nov 2007 19:35:43 +0100 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1194460644 28276 80.91.229.12 (7 Nov 2007 18:37:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 7 Nov 2007 18:37:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 07 19:37:27 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IppmA-0008Ru-Qx for ged-emacs-devel@m.gmane.org; Wed, 07 Nov 2007 19:37:19 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ipplz-0006ML-FK for ged-emacs-devel@m.gmane.org; Wed, 07 Nov 2007 13:37:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ippkv-0005Yi-2q for emacs-devel@gnu.org; Wed, 07 Nov 2007 13:36:01 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ippku-0005Xb-43 for emacs-devel@gnu.org; Wed, 07 Nov 2007 13:36:00 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ippkt-0005XJ-Pw for emacs-devel@gnu.org; Wed, 07 Nov 2007 13:35:59 -0500 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ippks-0005ir-TI for emacs-devel@gnu.org; Wed, 07 Nov 2007 13:35:59 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Ippkj-0001fa-Ce for emacs-devel@gnu.org; Wed, 07 Nov 2007 18:35:49 +0000 Original-Received: from remote4.student.chalmers.se ([129.16.29.77]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 07 Nov 2007 18:35:49 +0000 Original-Received: from bojohan+news by remote4.student.chalmers.se with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 07 Nov 2007 18:35:49 +0000 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 25 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: remote4.student.chalmers.se Mail-Copies-To: never User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/23.0.50 (gnu/linux) Cancel-Lock: sha1:xsbNpBryKBgvdjgBlPl+FhLf9QQ= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:82764 Archived-At: Stefan Monnier writes: >> C-c C-b in the diff buffer produces this refinement: > >> (foo abc (bar abc x)) >> ^^^^^^ ^^^^ ^^^^^^ > > :-( > That sucks! > You can fix it by setting smerge-refine-weight-hack to nil. So it this just a bad side-effect, rather than a bug? It also goes away when using (setq smerge-refine-ignore-whitespace nil) or -d --minimal Try hard to find a smaller set of changes. (In the latter case, it finds the second "abc" in the line.) -- Johan Bockgård