From: Konstantin Kharlamov <hi-angel@yandex.ru>
To: Eli Zaretskii <eliz@gnu.org>
Cc: monnier@IRO.UMontreal.CA, 34420@debbugs.gnu.org
Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict
Date: Sun, 17 Feb 2019 18:59:24 +0300 [thread overview]
Message-ID: <367ad2c0-e44f-2a13-e843-33f5b1b971fa@yandex.ru> (raw)
In-Reply-To: <83k1hyl92j.fsf@gnu.org>
On 17.02.2019 18:37, Eli Zaretskii wrote:
>> Cc: 34420@debbugs.gnu.org
>> From: Konstantin Kharlamov <hi-angel@yandex.ru>
>> Date: 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". The command name being explicit (at
>> least should be — I'm not a native English speaker, please tell me if
>> it's not) about going to the next conflict in the repository, and
>> conflicts are markers in different files.
>
> I'm not sure this is always the case. I can certainly envision a user
> who might be surprised by being switched to another buffer. Asking a
> question like "No more conflicts in this file; go to next one?" might
> in that case be a good idea.
The thing is, we already have a function that only works within focused
buffer, it is smerge-next.
This patch is about adding a more "global" function, one that works
within the focused repository instead of just the focused buffer.
>> Emitting a warning in this case would be annoying, because the user
>> expects to be taken to the next conflict if there's any.
>
> We could have an option to control this behavior.
>
next prev parent reply other threads:[~2019-02-17 15:59 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 [this message]
2019-02-18 3:22 ` Stefan Monnier
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=367ad2c0-e44f-2a13-e843-33f5b1b971fa@yandex.ru \
--to=hi-angel@yandex.ru \
--cc=34420@debbugs.gnu.org \
--cc=eliz@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 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.