From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Arni Magnusson <arnima@hafro.is>
Cc: 11067@debbugs.gnu.org
Subject: bug#11067: 24.0.94.1; diff-buffer-with-file
Date: Sat, 24 Mar 2012 14:19:26 -0400 [thread overview]
Message-ID: <jwv398xj2hq.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <alpine.LFD.2.02.1203221430400.49632@hafstokkur.hafro.is> (Arni Magnusson's message of "Thu, 22 Mar 2012 14:54:16 +0000 (UTC)")
> 2. Set `diff-command' to "winmerge" and `diff-switches' to nil
I think I'm beginning to understand the problem a bit better.
I.e. the immediate problem for you is the fact that the new code uses
"-L <label>", but in reality, even in Emacs-23 there were problems with
your approach: your diff-command does not behave as expected, which
breaks some code that uses diff-command internally (I'd guess that
smerge-resolve and diff-refine-hunk are affected, for example), and you
may end up with a "spurious" *diff* buffer displayed even though you
don't actually want/need it since you'll view the diff in the winmerge
window instead.
So I think that putting winmerge into diff-command is working at too-low
a level (tho it's the only level available to you right now). We'd want
instead to provide a new custom variable to let you choose your favorite
diff'ing tool, which can be a command like winmerge/kcompare/xxdiff, or
it could be diff+diff-mode (the current default behavior), or it could
be ediff.
For 24.1, we could provide a `diff-command-understands-L' which you
could set to nil (and which smerge-mode could also obey).
Stefan
prev parent reply other threads:[~2012-03-24 18:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 14:54 bug#11067: 24.0.94.1; diff-buffer-with-file Arni Magnusson
2012-03-23 21:34 ` Glenn Morris
2012-03-23 21:39 ` Glenn Morris
2012-03-24 1:49 ` Stefan Monnier
2012-03-24 6:15 ` Eli Zaretskii
2012-03-24 18:27 ` Glenn Morris
2012-03-24 21:12 ` Paul Eggert
2012-03-25 3:23 ` Stefan Monnier
2013-02-11 8:29 ` Glenn Morris
2012-03-24 1:53 ` Stefan Monnier
2012-03-24 2:28 ` Arni Magnusson
2012-03-24 6:13 ` Eli Zaretskii
2012-03-24 18:19 ` Stefan Monnier [this message]
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=jwv398xj2hq.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=11067@debbugs.gnu.org \
--cc=arnima@hafro.is \
/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.