From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 34420@debbugs.gnu.org, Konstantin Kharlamov <hi-angel@yandex.ru>
Subject: bug#34420: [PATCH 2/2] smerge-mode: new function to go to next conflict
Date: Sat, 16 Feb 2019 08:41:58 -0500 [thread overview]
Message-ID: <jwvr2c7kgcn.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <835ztkmbnk.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 16 Feb 2019 09:32:15 +0200")
>> To give some context: these patches follow this thread
>> http://lists.gnu.org/archive/html/help-gnu-emacs/2019-01/msg00111.html
>> (note: the thread continues the next month, i.e. February, too).
> I hope Stefan (CC'ed) could comment on those.
Hmm...
In terms of implementation, there's nothing very deep and it looks OK
(tho maybe it points to the need to autoload vc-find-conflicted-file,
and obviously I'd use (point-min) rather than a hardcoded 0 and change
the docstring to use the imperative rather than present tense).
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). Also, I'd save the file before switching to the next buffer.
Stefan
next prev parent reply other threads:[~2019-02-16 13:41 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 [this message]
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
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
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=jwvr2c7kgcn.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=34420@debbugs.gnu.org \
--cc=eliz@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 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).