From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Drew Adams" Newsgroups: gmane.emacs.help Subject: RE: Resyncing in ediff Date: Mon, 5 Mar 2012 14:34:58 -0800 Message-ID: <7C1E5301B6E84153B2586BA52BBED189@us.oracle.com> References: <495248DFDEA08C469BBDED2D4AA6C6143640C3@DAKIYA1.pegasus.local> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1330986920 10150 80.91.229.3 (5 Mar 2012 22:35:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 5 Mar 2012 22:35:20 +0000 (UTC) To: "'Doug Lewan'" , Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Mon Mar 05 23:35:19 2012 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1S4gUw-0005zB-SQ for geh-help-gnu-emacs@m.gmane.org; Mon, 05 Mar 2012 23:35:19 +0100 Original-Received: from localhost ([::1]:53272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4gUv-0006We-Qg for geh-help-gnu-emacs@m.gmane.org; Mon, 05 Mar 2012 17:35:17 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:53986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4gUq-0006WQ-6g for help-gnu-emacs@gnu.org; Mon, 05 Mar 2012 17:35:13 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4gUo-0007g7-Fr for help-gnu-emacs@gnu.org; Mon, 05 Mar 2012 17:35:11 -0500 Original-Received: from acsinet15.oracle.com ([141.146.126.227]:43944) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4gUo-0007fq-9h for help-gnu-emacs@gnu.org; Mon, 05 Mar 2012 17:35:10 -0500 Original-Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q25MZ6Tt021272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Mar 2012 22:35:07 GMT Original-Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q25MZ1et026150 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 5 Mar 2012 22:35:05 GMT Original-Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q25MYxvW007011; Mon, 5 Mar 2012 16:35:00 -0600 Original-Received: from dradamslap1 (/130.35.178.194) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 05 Mar 2012 14:34:59 -0800 X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <495248DFDEA08C469BBDED2D4AA6C6143640C3@DAKIYA1.pegasus.local> Thread-Index: Acz7GWqWYk/pGZnUQ7qE5IxUF6z0cgABgabg X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-CT-RefId: str=0001.0A090209.4F553F9B.0079,ss=1,re=0.000,fgs=0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 1) X-Received-From: 141.146.126.227 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:83948 Archived-At: > Sometimes ediff regions get off by one. (It seems to get > confused around lines that consist only of whitespace, > something that happens easily in emacs.) > > Is there a "nice" way to get ediff to resync? > > I can imagine writing the code to (1) gather relevant vars > and their values, (2) quit ediff, (3) narrow the buffers from > point to EOB, (4) run ediff-buffers on the same buffers and > (5) restore all the vars. However, I'm guessing that with the > complexity of ediff will make that slightly harder than my > uneducated imagination is guessing right now. Perhaps someone has a real answer for you. I do not. Here is what I do, FWIW: 1. Make sure both buffers have the same encoding - e.g. `undecided-unix'. For some reason, that can make a difference. If they are different, then sometimes Ediff works at first but does not work after hitting `!' etc. 2. Narrow the buffers to a region and ediff that. IOW, ediff the problematic areas piecemeal. With luck someone else will enlighten both of us. (Caveat: I sometimes use ediff with older Emacs versions (back to 20). It is possible that behavior is different for different versions.)