unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Drew Adams <drew.adams@oracle.com>
Cc: 17388@debbugs.gnu.org, kifer@cs.stonybrook.edu
Subject: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing
Date: Sat, 03 May 2014 09:48:27 +0300	[thread overview]
Message-ID: <83a9az1hok.fsf@gnu.org> (raw)
In-Reply-To: <111c9271-6a23-426e-adb2-ff5520c02806@default>

> Date: Fri, 2 May 2014 20:11:54 -0700 (PDT)
> From: Drew Adams <drew.adams@oracle.com>
> Cc: 17388-done@debbugs.gnu.org, Michael Kifer <kifer@cs.stonybrook.edu>
> 
> There should be EITHER, (a) as previously, NO fine diffs shown for
> other than the current diff OR (b) CORRECT (helpful) fine diffs
> shown for the non-current diffs.

Ediff's "fine diffs" are word-granular.  That is, Ediff breaks each
line into "words", then passes the result to the Diff program for
comparisoon, and reflects the results with different faces.  AFAIR,
this has always been that way.

The Ediff manual says:

  `ediff-forward-word-function'
       This variable controls how fine differences are computed.  The
       value must be a Lisp function that determines how the current
       difference region should be split into words.

       Fine differences are computed by first splitting the current
       difference region into words and then passing the result to
       `ediff-diff-program'.  For the default forward word function
       (which is `ediff-forward-word'), a word is a string consisting of
       letters, `-', or `_'; a string of punctuation symbols; a string of
       digits, or a string consisting of symbols that are neither space,
       nor a letter.

       This default behavior is controlled by four variables:
       `ediff-word-1', ..., `ediff-word-4'.  See the on-line
       documentation for these variables and for the function
       `ediff-forward-word' for an explanation of how to modify these
       variables.

I think what you describe in your item #2 is exactly the above
behavior.  (The problem described under #1 is now fixed by Stefan.)

> Stephen Berman's confirmation indicates that Cygwin `diff' is
> irrelevant:
> 
> > I see both of these problematic highlightings on GNU/Linux builds from
> > both the trunk (bzr 117042) and the emacs-24 branch (bzr 117049).

I can confirm that too, but (a) I don't think the 2nd issue
constitutes a "problem" (see above), and (b) it is definitely not a
"REGRESSION", because older Emacsen behaved the same wrt fine diffs
inside a line.





  reply	other threads:[~2014-05-03  6:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-02 15:15 bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing Drew Adams
2014-05-02 18:57 ` Stephen Berman
2014-05-03  2:27   ` Stefan Monnier
2014-05-03  3:11     ` Drew Adams
2014-05-03  6:48       ` Eli Zaretskii [this message]
     [not found] <<eb90ee40-d0cb-46f0-8ce1-1759d110cbbd@default>
     [not found] ` <<87wqe43t55.fsf@rosalinde.fritz.box>
     [not found]   ` <<jwvwqe3mx1m.fsf-monnier+emacsbugs@gnu.org>
     [not found]     ` <<111c9271-6a23-426e-adb2-ff5520c02806@default>
     [not found]       ` <<83a9az1hok.fsf@gnu.org>
2014-05-03 14:01         ` Drew Adams
2014-05-03 16:42           ` Eli Zaretskii
     [not found]         ` <8613042fc3be4f9995e33e38d4f079f0@HUBCAS1.cs.stonybrook.edu>
2014-05-03 15:57           ` Michael Kifer
2014-05-03 20:41             ` Drew Adams
2014-05-04  3:54               ` Stefan Monnier
2014-05-04  7:16                 ` Drew Adams
     [not found]         ` <<bbf71aaa-f669-4542-a8d1-b7ff9d40d66e@default>
     [not found]           ` <<83y4yizue3.fsf@gnu.org>
2014-05-03 20:56             ` Drew Adams

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=83a9az1hok.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=17388@debbugs.gnu.org \
    --cc=drew.adams@oracle.com \
    --cc=kifer@cs.stonybrook.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).