unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
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: Sat, 23 Nov 2013 16:03:19 +0100	[thread overview]
Message-ID: <8761rjnoso.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jwvr4a7xk7u.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Sat, 23 Nov 2013 09:33:43 -0500")

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Uh what?  The keybindings use a, b, and c.  The only connection to the
>> buffers is via visual arrangement, not via "MINE" and "OTHER.
>
> The ediff bindings, yes, but not the smerge-mode bindings.

Well, it's smerge-ediff that my patch changed, and it's smerge-ediff
that's the subject of this thread, and I checked the whole thread to
make absolutely sure that I have not mentioned anything else (such as
smerge-mode) anywhere.  Indeed, I didn't.

If you feel you should draw smerge-mode into it and solve the basic lack
of information in a different manner, that's commendable.  If not, the
provided patch helps those people who use smerge-ediff for conflict
resolution.  Which may be fewer than the users of smerge-mode.el as a
whole, but more than nobody.

If you feel you want to improve on this, but not now: it's extremely
unlikely that anybody will make programmatic use of the buffer names, so
it's not like this code might create physical dependencies.

It takes up buffer name length (but those are usually truncated anyway
because of their side by side placement), and it takes startup time, but
not likely much.

-- 
David Kastrup



  reply	other threads:[~2013-11-23 15:03 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 [this message]
2013-11-23 14:07   ` David Kastrup
2013-11-25 15:40     ` Stefan Monnier
2013-11-27 10:45       ` David Kastrup
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=8761rjnoso.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).