From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: make smerge-mode move the point? Date: Sun, 13 Jan 2008 16:43:47 -0800 Message-ID: <200801140043.m0E0hqJ2006629@oogie-boogie.ics.uci.edu> References: <200801132014.m0DKEito029530@oogie-boogie.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1200271610 10235 80.91.229.12 (14 Jan 2008 00:46:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Jan 2008 00:46:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 14 01:47:13 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JEDTq-0007A3-TT for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2008 01:47:11 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEDTS-0004Az-K9 for ged-emacs-devel@m.gmane.org; Sun, 13 Jan 2008 19:46:46 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JEDTN-00044v-5T for emacs-devel@gnu.org; Sun, 13 Jan 2008 19:46:41 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JEDTM-00043k-Jy for emacs-devel@gnu.org; Sun, 13 Jan 2008 19:46:40 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEDTM-00043U-BQ for emacs-devel@gnu.org; Sun, 13 Jan 2008 19:46:40 -0500 Original-Received: from oogie-boogie.ics.uci.edu ([128.195.1.41]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JEDTM-0001Ji-5Y for emacs-devel@gnu.org; Sun, 13 Jan 2008 19:46:40 -0500 Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by oogie-boogie.ics.uci.edu (8.13.6/8.13.6) with ESMTP id m0E0hqJ2006629; Sun, 13 Jan 2008 16:43:52 -0800 (PST) In-Reply-To: (Stefan Monnier's message of "Sun, 13 Jan 2008 16:55:28 -0500") Original-Lines: 33 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-1.363, required 5, autolearn=disabled, ALL_TRUSTED -1.44, TW_SV 0.08) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-kernel: by monty-python.gnu.org: Solaris 9 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:86857 Archived-At: Stefan Monnier 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?