From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: Diff faces Date: Fri, 19 Oct 2007 23:55:55 +0300 Organization: JURTA Message-ID: <8764124yec.fsf@jurta.org> References: <87tzoxqk2y.fsf@jurta.org> <87ir594b8f.fsf@jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1192830359 25471 80.91.229.12 (19 Oct 2007 21:45:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 19 Oct 2007 21:45:59 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 19 23:46:00 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 1IizfE-0000n2-C7 for ged-emacs-devel@m.gmane.org; Fri, 19 Oct 2007 23:45:52 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Iizf6-0001cY-QS for ged-emacs-devel@m.gmane.org; Fri, 19 Oct 2007 17:45:44 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Iizf2-0001ag-V2 for emacs-devel@gnu.org; Fri, 19 Oct 2007 17:45:41 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Iizf1-0001aU-Iu for emacs-devel@gnu.org; Fri, 19 Oct 2007 17:45:40 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Iizf1-0001aR-Cc for emacs-devel@gnu.org; Fri, 19 Oct 2007 17:45:39 -0400 Original-Received: from mailman.kiev.sovam.com ([89.162.150.100]) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Iizf0-00039B-Vb for emacs-devel@gnu.org; Fri, 19 Oct 2007 17:45:39 -0400 Original-Received: from relay01.kiev.sovam.com ([62.64.120.200]) by mailman.kiev.sovam.com with esmtp (Exim 4.63 (FreeBSD)) (envelope-from ) id 1Ij2Sg-000CAz-NE; Sat, 20 Oct 2007 00:45:06 +0000 Original-Received: from [83.170.232.243] (helo=smtp.svitonline.com) by relay01.kiev.sovam.com with esmtp (Exim 4.67) (envelope-from ) id 1Iizew-0000RY-5I; Sat, 20 Oct 2007 00:45:35 +0300 In-Reply-To: (Stefan Monnier's message of "Fri\, 19 Oct 2007 12\:18\:41 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) X-Scanner-Signature: 8abf2c83e696415c40c55866f9369f42 X-DrWeb-checked: yes X-SpamTest-Envelope-From: juri@jurta.org X-SpamTest-Group-ID: 00000000 X-SpamTest-Header: Not Detected X-SpamTest-Info: Profiles 1643 [Oct 20 2007] X-SpamTest-Info: helo_type=3 X-SpamTest-Info: {HEADERS: header Content-Type found without required header Content-Transfer-Encoding} X-SpamTest-Info: {TO: local part of email appears in body} X-SpamTest-Method: none X-SpamTest-Rate: 35 X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0255], KAS30/Release X-detected-kernel: by monty-python.gnu.org: FreeBSD 6.x (1) 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:81259 Archived-At: >> BTW, I think the current character-wise refinement in diff-mode and in >> smerge-mode is not very useful. More useful would be to refine it on the >> word or symbol basis. I have an experimental patch that produces good >> results. It splits original hunks symbol-by-symbol (though word-by-word >> works as well) and compares them ignoring whitespace differences. > > I've installed a similar (tho significantly more complex) patch. > Can you tell me if you like the new behavior? The new behavior is excellent. Thanks. I think word granularity is now more useful even when it highlights whole words that differ only in one character. BTW, smerge has a key binding `C-c ^ R' to refine differences, but diff-mode has `C-c C-b'. What about using more similar keys like `C-c R' for diff-mode? And maybe also add a special key to refine without ignoring whitespace (by setting smerge-refine-ignore-whitespace temporarily to nil, or vice versa depending on its customized value) and to bind it to e.g. `C-c W' and `C-c ^ W'? -- Juri Linkov http://www.jurta.org/emacs/