all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dan Nicolaescu <dann@ics.uci.edu>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: make smerge-mode move the point?
Date: Sun, 13 Jan 2008 16:43:47 -0800	[thread overview]
Message-ID: <200801140043.m0E0hqJ2006629@oogie-boogie.ics.uci.edu> (raw)
In-Reply-To: <jwvprw5qtrl.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Sun, 13 Jan 2008 16:55:28 -0500")

Stefan Monnier <monnier@iro.umontreal.ca> writes:

  > > Wouldn't it be better if smerge-mode moved the point to the first
  > > conflict marker? 
  > 
  > > Resolving conflicts is the reason this mode gets turned on, so it would
  > > be nicer for the user if it would move the point to the first conflict.
  > > It would be one less action to do, and it would make it easier to see
  > > there's a conflict.
  > 
  > I think it would be wrong for the `smerge-mode' command to move point.
  > (De)activating such a minor mode shouldn't move point.
  > 
  > 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))))

  > (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?

  reply	other threads:[~2008-01-14  0:43 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 [this message]
2008-01-14  1:55     ` 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=200801140043.m0E0hqJ2006629@oogie-boogie.ics.uci.edu \
    --to=dann@ics.uci.edu \
    --cc=emacs-devel@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.