From: Eli Zaretskii <eliz@gnu.org>
To: Drew Adams <drew.adams@oracle.com>, 1183@emacsbugs.donarmstrong.com
Cc: emacs-pretest-bug@gnu.org, bug-gnu-emacs@gnu.org
Subject: bug#1183: 23.0.60; ediff-buffers is broken
Date: Thu, 16 Oct 2008 22:25:25 +0200 [thread overview]
Message-ID: <utzbcmgne.fsf@gnu.org> (raw)
In-Reply-To: <00a101c92fbf$998d19b0$c2b22382@us.oracle.com>
> From: "Drew Adams" <drew.adams@oracle.com>
> Date: Thu, 16 Oct 2008 11:47:11 -0700
> Cc:
>
> emacs -Q
>
> Visit both the bookmark.el file from this installation (see below) and
> a copy of bookmark.el from CVS for today, 2008-10-16.
>
> The only difference between the two files is in fact this text which
> was added to the CVS version near the end of the file, just before
> run-hooks:
>
> (defun bookmark-unload-function ()
> "Unload the Bookmark library."
> (when bookmark-save-flag (bookmark-save))
> ;; continue standard unloading
> nil)
>
> You can see this by using ediff in Emacs 22, 21, or 20 - or by using
> diff.
>
> However, ediff-buffers shows the entire buffers as a single diff, and
> hitting `*' to refine that diff has no effect at all. IOW,
> ediff-buffers is now useless for seeing the differences between these
> two files.
I don't have the ``bookmark.el file from this installation'' (you
didn't attach it), so I produced it manually by copying today's
bookmark.el and then removing the function bookmark-unload-function.
With these two files, I can only reproduce this with Emacs built on
Windows from today's CVS if one of the files has Unix end-of-line
format, while the other has DOS/Windows EOL format. Is that your
case?
If so, this is expected: Ediff on Windows invokes the `diff' program
with the --binary option (see ediff-diff-options), which makes all
lines compare not equal due to the different line endings. You can
see this by using `diff' directly from the shell's prompt, if you pass
it the --binary option.
If both files have identical EOL format, Ediff produces the output
you'd expect.
(The reason for the --binary option is to allow comparison of buffers
and files with non-ASCII text, which IMO is a much more important
use-case than two almost identical files with different line endings.)
next prev parent reply other threads:[~2008-10-16 20:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <ur66ck3d4.fsf@gnu.org>
2008-10-16 18:47 ` bug#1183: 23.0.60; ediff-buffers is broken Drew Adams
2008-10-16 20:25 ` Eli Zaretskii [this message]
2008-10-16 20:45 ` Drew Adams
2008-10-16 21:15 ` Eli Zaretskii
2008-10-16 21:58 ` Drew Adams
2008-10-17 12:38 ` Eli Zaretskii
2008-10-17 14:36 ` Drew Adams
2008-10-17 16:02 ` Stefan Monnier
2008-10-17 16:48 ` Drew Adams
2008-10-17 17:05 ` Michael Kifer
2008-10-17 17:17 ` Drew Adams
2008-10-17 18:15 ` Eli Zaretskii
2008-10-17 18:35 ` Drew Adams
2008-10-18 3:17 ` Michael Kifer
2008-10-18 3:43 ` Drew Adams
2008-10-18 9:07 ` Eli Zaretskii
2008-10-19 2:17 ` Stefan Monnier
2008-10-19 7:17 ` Eli Zaretskii
2008-10-19 7:23 ` Eli Zaretskii
2008-10-19 8:32 ` Eli Zaretskii
2008-10-19 15:07 ` Drew Adams
2008-10-19 15:32 ` Eli Zaretskii
2008-10-17 18:19 ` Eli Zaretskii
2008-10-17 18:35 ` Drew Adams
2008-10-17 18:34 ` Eli Zaretskii
2008-10-19 2:21 ` Stefan Monnier
2008-10-19 15:40 ` bug#1183: marked as done (23.0.60; ediff-buffers is broken) Emacs bug Tracking System
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=utzbcmgne.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=1183@emacsbugs.donarmstrong.com \
--cc=bug-gnu-emacs@gnu.org \
--cc=drew.adams@oracle.com \
--cc=emacs-pretest-bug@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 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).