all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Konstantin Kharlamov <hi-angel@yandex.ru>
Cc: 34420@debbugs.gnu.org
Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict
Date: Sun, 17 Feb 2019 22:22:09 -0500	[thread overview]
Message-ID: <jwv8syerkpk.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <4f8f43b4-a64c-6c90-52e2-3b20bc4e214f@yandex.ru> (Konstantin Kharlamov's message of "Sun, 17 Feb 2019 12:18:53 +0300")

>> In terms of UI it's a question of taste: I didn't provide such a command
>> because I never felt the need for it (I think I like to be in control of
>> changing buffer).  Maybe I'd change it to first emit a warning "no more
>> conflicts in this buffer" and only go to the next buffer if you repeat
>> the command (as a form of confirmation that you're done with the current
>> buffer).
> Well, I wouldn't call changing a buffer upon explicit command from a user
> a "taking control from them".

I didn't mean it in the sense that the command misbehaves.  Just that
the command does 2 things (go to the next conflict in the same file
sometimes, and go the next conflict in another file other times) and as
a user I'd prefer to know which one's going to happen before
it happens.  As I said it's a question of taste.

I think I could be tempted to use your command (in place of smerge-next)
if it requested confirmation before going to the next file.

I'll install your code as a first step,


        Stefan





  parent reply	other threads:[~2019-02-18  3:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-10 21:14 bug#34421: [PATCH 1/2] smerge-mode: factor out going to next conflict Konstantin Kharlamov
2019-02-10 21:14 ` bug#34420: [PATCH 2/2] smerge-mode: new function to go " Konstantin Kharlamov
2019-02-10 22:30   ` bug#34420: [PATCH v2 " Konstantin Kharlamov
2019-02-13 21:44   ` bug#34420: [PATCH " Konstantin Kharlamov
2019-02-16  7:32     ` Eli Zaretskii
2019-02-16  7:32     ` Eli Zaretskii
2019-02-16 13:41       ` Stefan Monnier
2019-02-17  9:18         ` Konstantin Kharlamov
2019-02-17 15:37           ` Eli Zaretskii
2019-02-17 15:59             ` Konstantin Kharlamov
2019-02-18  3:22           ` Stefan Monnier [this message]
2019-02-18 17:49             ` Stefan Monnier
2019-02-18 21:12               ` hi-angel
2019-02-18 21:51                 ` Stefan Monnier
2019-02-18 22:01                   ` hi-angel
2019-02-18 23:28                     ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwv8syerkpk.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=34420@debbugs.gnu.org \
    --cc=hi-angel@yandex.ru \
    /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.