From: Drew Adams <drew.adams@oracle.com>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 17388-done@debbugs.gnu.org, Michael Kifer <kifer@cs.stonybrook.edu>
Subject: bug#17388: 24.4.50; REGRESSION: Ediff - 1) wrong face, 2) incorrect diffing
Date: Fri, 2 May 2014 20:11:54 -0700 (PDT) [thread overview]
Message-ID: <111c9271-6a23-426e-adb2-ff5520c02806@default> (raw)
In-Reply-To: <jwvwqe3mx1m.fsf-monnier+emacsbugs@gnu.org>
> >> See the attached screenshot. The first diff shown, with the gray
> >> highlighting, shows the regression.
>
> I installed the patch below which should fix those problems, thanks.
>
> >> 2. The fine diffs are also not correct. See the same screenshot. For
> >> the first diff, "advertise" and "d-signature-table" should be
> >> highlighted the same as "(defvar " and ")", and for the second diff,
> >> "fil" and "s-alist" should be highlighted the same as "(defvar " and
> >> ")". These are not differences.
>
> You mean you want finer granularity of fine diffs.
Not at all. How do you get that from what I said?
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.
In the text you quoted I spoke only of (a): return to the previous
behavior of NOT showing fine diffs except for the current diff.
> >> still a regression wrt prior Emacs versions. With Emacs 24.3, for
> >> instance (using the same Cygwin `diff'), there is no fine diff shown
> >> here. Instead, the diff, which is shown only as a main diff, is between
> >> "file-local-variables-alist" and "filxxxxxxxxxxxxxxxxxxxxxs-alist".
> >> Which is correct.
>
> I don't see that here with Debian's Emacs-24.3, and neither with 23.4.
It's not very clear from the above what you see and do not see,
especially since you apparently did not understand the description.
Do you see a bug for Emacs 24.3 or 23.4? There is none that I see -
the behavior is as I described it. No fine diffs are shown for the
non-current diff highlighting with Emacs 24.3 or 23.4.
Are you sure you are looking at the non-current diffs (the gray ones)?
That's where both bugs are: (1) wrong face (`default'), (2) incorrect
fine diffing.
I just repeated everything, again starting from emacs -Q with the
above recipe, using 24.3. That's 5 times now I've done it (2x for
24.4, 24.3, 1x for 23.4). Same thing - just what I described originally.
> The behavior you describe seems to correspond to ediff-word-mode, IIRC,
> so I assume this is not really a bug/regression but just a pilot error
> on your part. If not, feel free to re-open this bug report, providing
> more details about the problem.
I can no longer reopen bugs - Glenn apparently banned me some time ago.
This has nothing to do with `ediff-word-mode' or pilot error.
What I showed and described was already from emacs -Q. And S. Berman
had no trouble following the recipe and confirming the behavior.
But let me try again.
emacs -Q
Load file `cygwin-mount.el', then `setup-cygwin.el' (from Emacs Wiki).
Cygwin `diff' is apparently irrelevant, but that's what I used anyway.
In foo.el type some text. E.g.:
(defvar advertised-signature-table)
(defvar dir-local-variables-alist)
(defvar dir-locals-file)
(defvar file-local-variables-alist)
(defvar Info-indexed-nodes)
Put the same text in bar.el. Then modify it a bit in bar.el:
(defvar advertiseyyyyyyyyyyyd-signature-table)
(defvar dir-local-variables-alist)
(defvar dir-locals-file)
(defvar filxxxxxxxxxxxxxxs-alist)
(defvar Info-indexed-nodes)
M-x ediff-buffers ; for foo.el and bar.el
Cycle among the two diffs. You will see the screenshot I sent.
Now read the bug report as to what is wrong with what you see,
if it is still not clear why it is a bug (2 bugs).
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).
next prev parent reply other threads:[~2014-05-03 3:11 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 [this message]
2014-05-03 6:48 ` Eli Zaretskii
[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=111c9271-6a23-426e-adb2-ff5520c02806@default \
--to=drew.adams@oracle.com \
--cc=17388-done@debbugs.gnu.org \
--cc=kifer@cs.stonybrook.edu \
--cc=monnier@iro.umontreal.ca \
/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).