From: "Drew Adams" <drew.adams@oracle.com>
To: "'Doug Lewan'" <dougl@shubertticketing.com>, <help-gnu-emacs@gnu.org>
Subject: RE: Resyncing in ediff
Date: Mon, 5 Mar 2012 14:34:58 -0800 [thread overview]
Message-ID: <7C1E5301B6E84153B2586BA52BBED189@us.oracle.com> (raw)
In-Reply-To: <495248DFDEA08C469BBDED2D4AA6C6143640C3@DAKIYA1.pegasus.local>
> 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.)
prev parent reply other threads:[~2012-03-05 22:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 21:48 Resyncing in ediff Doug Lewan
2012-03-05 22:34 ` Drew Adams [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7C1E5301B6E84153B2586BA52BBED189@us.oracle.com \
--to=drew.adams@oracle.com \
--cc=dougl@shubertticketing.com \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.