From: Carlo Traverso <traverso@dm.unipi.it>
Cc: keichwa@gmx.net, alex@gnu.org, kifer@cs.sunysb.edu, emacs-devel@gnu.org
Subject: Re: ediff feature request: diffing line by line
Date: Sun, 17 Mar 2002 17:26:46 +0100 (CET) [thread overview]
Message-ID: <20020317162646.D1CCAB804@cardano.dm.unipi.it> (raw)
In-Reply-To: <jeit7v42yi.fsf@sykes.suse.de> (message from Andreas Schwab on Sun, 17 Mar 2002 16:40:53 +0100)
I had missed ediff-regions-wordwise and ediff-windows-wordwise, that
solve a lot of my problems; however these three enhancements would
help:
1 - switching from ediff-buffers to ediff-regions-wordwise: a key
could be defined to select the current ediff regions in both
buffers and enter an ediff-regions-wordwise on them; the same for
ediff-windows-wordwise. This is currently possible, but not with one
key (this should be extremely easy to implement).
2 - the highlighting scheme should be revised, since entering
ediff-regions-wordwise from ediff-buffers removes highlighting from
the current word (i.e. the current region in ediff and the current
word in ediff-regions-wordwise are highlited in the same color...)
ediff-windows-wordwise inside of ediff-buffers is even worse....
(this should be very easy too)
3 - enhancing ediff-regions-wordwise (ediff-windows-wordwise) allowing
to discover and reconcile whitespace "substantial" differences: I
consider "substantial" these differences:
- additional blank lines
- space between words vs no space between words (e.g. "one=1" vs "one = 1"
The amount of whitespace (e.g. " " vs " ") or the type (space, tab,
newline) is inessential (but two consecutive newlines is not the same
as one newline...)
(I am uncertain about space at the beginning of a line...)
----
Before sending this message (after composing it) I have compiled emacs
21.1.1 (I was using 20.7.1); unfortunately, I have to say that the new
version of ediff-*-wordwise is worse for my purpose:
in this example, in the old version there were two differences:
Que la dont je viens d outremer
^^^^^ ^
Que la dont je vieng d'outremer
that have collapsed in one larger difference:
Que la dont je viens d outremer
^^^^^^^^^^^^^^^^
Que la dont je vieng d'outremer
and of course here I have to choose one from each version...
Apparently the definition of "wordwise" has changed; maybe, what I
would like to have is an "ediff-*-characterwise" with the possibility
to switch from one "ediff-*-*wise" to the other.
There is a small shift in behaviour as far as point 2 of the above
enhancements is concerned, with a small (but non substantial)
improvement.
Carlo
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel
next prev parent reply other threads:[~2002-03-17 16:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-03-16 13:54 ediff feature request: diffing line by line Karl Eichwalder
2002-03-16 16:27 ` Carlo Traverso
2002-03-16 17:43 ` Michael Kifer
2002-03-16 23:04 ` Alex Schroeder
2002-03-17 4:04 ` Karl Eichwalder
2002-03-17 15:40 ` Andreas Schwab
2002-03-17 16:26 ` Carlo Traverso [this message]
2002-03-17 18:37 ` Michael Kifer
2002-03-17 20:41 ` Carlo Traverso
2002-03-17 19:20 ` Richard Stallman
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20020317162646.D1CCAB804@cardano.dm.unipi.it \
--to=traverso@dm.unipi.it \
--cc=alex@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=keichwa@gmx.net \
--cc=kifer@cs.sunysb.edu \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).