From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dan Nicolaescu <dann@ics.uci.edu>
Cc: emacs-devel@gnu.org
Subject: Re: make smerge-mode move the point?
Date: Sun, 13 Jan 2008 20:55:11 -0500 [thread overview]
Message-ID: <jwvzlv9fa1d.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <200801140043.m0E0hqJ2006629@oogie-boogie.ics.uci.edu> (Dan Nicolaescu's message of "Sun, 13 Jan 2008 16:43:47 -0800")
>> OTOH when smerge-mode gets enabled in response to a VC action, it
>> probably makes sense to move point, indeed. So I suggest to add a new
>> command that activates smerge-mode and moves to the first conflict
> Like this?
> ;;;###autoload
> (defun smerge-auto ()
> "Turn on `smerge-mode' and move point to first conflict marker.
> If no conflict maker is found, turn off `smerge-mode'."
> (smerge-mode 1)
> (condition-case nil
> (smerge-next)
> (error (smerge-auto-leave))))
Looks OK.
>> (and probably run a hook where the user can place things like
>> smerge-resolve-all).
> Not sure what you mean here. Is this for something like
> vc-svn-resolve-when-done, or something else?
No, as the docstring of smerge-resolve-all explains: "Perform automatic
resolution on all conflicts".
Stefan
prev parent reply other threads:[~2008-01-14 1:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-13 20:14 make smerge-mode move the point? Dan Nicolaescu
2008-01-13 21:55 ` Stefan Monnier
2008-01-14 0:43 ` Dan Nicolaescu
2008-01-14 1:55 ` Stefan Monnier [this message]
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=jwvzlv9fa1d.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dann@ics.uci.edu \
--cc=emacs-devel@gnu.org \
/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.