From: David Kastrup <dak@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful
Date: Wed, 27 Nov 2013 11:45:29 +0100 [thread overview]
Message-ID: <8761ref7hy.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jwvmwkssd56.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon, 25 Nov 2013 10:40:51 -0500")
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> At any rate, this is what I went with. Feel free to take it; I have a
>> copyright assignment for Emacs on file.
>
> Installed with minor tweaks, thank you,
I've finally taken the time to take a look at it. The only user-visible
tweak in my opinion, while unquestionably deliberate, is a mistake: you
decided to shove MINE = ... and OTHER = ... strings into the buffer
names before the identifying strings.
For one thing, smerge-ediff (purportedly as opposed to the smerge-mode
not visibly involved in the user interaction) does not expose _any_ of
the MINE/OTHER terminology to the user, so this is a distraction not
reflecting anything in the ediff-help. For the usual case of a rebase
along the lines of
git pull -r
it labels the upstream changes as "MINE" and my own changes as "OTHER".
Not helpful. If there was _any_ point in labelling, one should use A
and B, the actual names used for the ediff keybindings that are active
here. But it's not usually a puzzler to figure out whether A or B comes
first, so that seems unnecessary.
But worse is that we are talking about the buffer names of buffers in a
horizontally split window. For the normal terminal line length of 80,
and for a somewhat normal mode line with a non-minimal file name, this
means that the misleading and useless information does not leave _any_
room for the helpful information on the split mode line.
So we are back to where we started from, just in a more complex manner.
--
David Kastrup
next prev parent reply other threads:[~2013-11-27 10:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87zjowpn2s.fsf@fencepost.gnu.org>
2013-11-23 1:42 ` smerge-ediff "MINE" and "OTHER" monikers unhelpful Stefan Monnier
2013-11-23 6:23 ` David Kastrup
2013-11-23 14:33 ` Stefan Monnier
2013-11-23 15:03 ` David Kastrup
2013-11-23 14:07 ` David Kastrup
2013-11-25 15:40 ` Stefan Monnier
2013-11-27 10:45 ` David Kastrup [this message]
2013-11-27 17:37 ` Stefan Monnier
2013-11-27 18:07 ` David Kastrup
2013-11-27 18:45 ` David Kastrup
2013-11-27 20:46 ` Stefan Monnier
2013-11-27 20:54 ` David Kastrup
2013-11-28 8:44 ` Thien-Thi Nguyen
2013-11-28 18:31 ` Stefan Monnier
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=8761ref7hy.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=emacs-devel@gnu.org \
--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).