[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict
From: |
Stefan Monnier |
Subject: |
bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict |
Date: |
Sun, 17 Feb 2019 22:22:09 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
>> 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
- bug#34421: [PATCH 1/2] smerge-mode: factor out going to next conflict, Konstantin Kharlamov, 2019/02/10
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Konstantin Kharlamov, 2019/02/10
- bug#34420: [PATCH v2 2/2] smerge-mode: new function to go to next conflict, Konstantin Kharlamov, 2019/02/10
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Konstantin Kharlamov, 2019/02/13
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Eli Zaretskii, 2019/02/16
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Stefan Monnier, 2019/02/16
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Konstantin Kharlamov, 2019/02/17
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Eli Zaretskii, 2019/02/17
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Konstantin Kharlamov, 2019/02/17
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict,
Stefan Monnier <=
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Stefan Monnier, 2019/02/18
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, hi-angel, 2019/02/18
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Stefan Monnier, 2019/02/18
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, hi-angel, 2019/02/18
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Stefan Monnier, 2019/02/18
- bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict, Eli Zaretskii, 2019/02/16