Re: smerge-ediff "MINE" and "OTHER" monikers unhelpful

[David Kastrup]

Stefan Monnier <address@hidden> writes:

>> For one thing, smerge-ediff (purportedly as opposed to the smerge-mode
>> not visibly involved in the user interaction) does not expose _any_ of
>
> We can't assume that the user of smerge-ediff does not also use
> smerge.

smerge-ediff is a utility of its own with its own user interface.  If
you call smerge-ediff from inside of smerge-mode, you can easily enough
pass "MINE", "OTHER" and "BASE" as function arguments in order to
maintain terminology across calls.

> So it's important to keep a connection between the names used in
> smerge and the names used in ediff.

Only if smerge-ediff is called from smerge-mode, and then it's easy to
pass the strings for getting the old behavior.

> Maybe in your case it's not helpful, but I think the added text should
> clarify the problem (and the 5/6 extra chars may occasionally push the
> extra info past the truncation, but this truncation problem exists
> even without those extra 5/6 chars).

The truncation problem is vastly acerbated with the 7 characters
"OTHERS=".  Not "occasionally", but pretty much always when we are
talking about an 80 column terminal which is pretty much a standard
working width since punchcard time (you don't want to edit most Fortran
code without it).

>> git pull -r
>> it labels the upstream changes as "MINE" and my own changes as "OTHER".
>
> Of course, any tool is free top put the 2 in whichever order they
> prefer.  Maybe we should revisit the MINE/OTHER names used so far.
> But whichever name we use there will need to also be present in
> smerge-ediff.

Only if you call smerge-ediff from within smerge-mode (using its
keybinding).  But then you _can_ pass it the names.  Possibly any passed
strings can be _added_ to the marker texts in the buffer names rather
than replacing them: there's probably nothing wrong putting the marker
texts out additionally anyway even if most of them is going to get cut
off.

But when called interactively standalone, "MINE", "OTHER", "BASE" are
pointless and confusing.  They have _no_ relation to ediff-mode and/or
to the keybindings and helps.

-- 
David Kastrup