all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Drew Adams" <drew.adams@oracle.com>
To: "'Samuel Wales'" <samologist@gmail.com>, <help-gnu-emacs@gnu.org>
Subject: RE: ediff refinement issues
Date: Sat, 26 Nov 2011 09:51:00 -0800	[thread overview]
Message-ID: <37A77E4AAFA04D55AE5F755FDFB995F7@us.oracle.com> (raw)
In-Reply-To: <CAJcAo8tT6twSdoN7045Cke45K7p24atLK_4HHJc8pOrgAuQNJw@mail.gmail.com>

>   1) When there are only whitespace differences in normal
>      paragraphs, such as by refilling, ediff works well.  It
>      says there are only whitespace differences and does not
>      highlight any words.
> 
>      However, if the paragraphs are commented (for example,
>      with ;;; in elisp or # in shell), it highlights the ;;;
>      or the #.  it also sometimes highlights words as a side
>      effect.

I don't see that.  Maybe give a concrete example.  What I see is that whitespace
is either ignored everywhere or it is not ignored at all (toggle this with
`##').

>      I want ediff to show refilled commented paragraphs as
>      only having whitespace differences.

Are you sure that the paragraphs themselves have only whitespace differences?
You say that `;;;' is highlighted as different.  Do you mean that the `;;;' is
highlighted in both of these identical lines?

;;; commented line

;;; commented line

>   2) When I change a date like 2011-01-01, ediff highlights
>      the entire date even if I only changed one part of it.
>      For example, if I change 01 to 02, it will still
>      highlight the entire date.
>      I want it to show only the part I changed.
> 
> There are variables ediff-word-1 ediff-word-2 ediff-word-3
> ediff-word-4 that are supposed to customize this.  I tried
> them in various ways and they didn't produce the results I
> wanted.  How do you use those variables to do this?

I've never played with that, and I don't know of any command or option that
helps here, but maybe someone else can help.  Looking in the code a bit, I see
this:

1. Those are defvars, not defcustoms.
2. They are buffer-local.

So I tried this in each of two buffers that had only this, respectively:
"2011-01-01" and "2011-01-02": `M-: (setq ediff-word-1 "[:word]")'.

Then, hitting `!' showed a refinement that distinguished "2011" from the rest.
I would have expected the "01" / "02" difference to be distinguished. Maybe you
can play around a little more this way to get what you want.




  reply	other threads:[~2011-11-26 17:51 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <AcysXwOm6vNJt6yHT5KpcypPYeDckQAAVtPw>
2011-11-26 17:15 ` ediff refinement issues Samuel Wales
2011-11-26 17:51   ` Drew Adams [this message]
2011-11-26 18:20     ` Samuel Wales
2011-11-26 18:38       ` Drew Adams
2011-11-29 10:54         ` Thien-Thi Nguyen
2011-11-29 17:27           ` Samuel Wales
2011-12-06 14:16             ` Thien-Thi Nguyen
2021-03-29  4:46     ` Samuel Wales
2021-03-29  4:48       ` Samuel Wales
2021-03-29  5:27         ` Eli Zaretskii
2021-03-30 22:04           ` Samuel Wales
2021-03-31  2:56       ` Stefan Monnier
2021-03-30 23:26     ` Michael Heerdegen
2011-11-26 20:28   ` Peter Münster

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=37A77E4AAFA04D55AE5F755FDFB995F7@us.oracle.com \
    --to=drew.adams@oracle.com \
    --cc=help-gnu-emacs@gnu.org \
    --cc=samologist@gmail.com \
    /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.