From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: make smerge-mode move the point? Date: Sun, 13 Jan 2008 20:55:11 -0500 Message-ID: References: <200801132014.m0DKEito029530@oogie-boogie.ics.uci.edu> <200801140043.m0E0hqJ2006629@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 1200275725 19020 80.91.229.12 (14 Jan 2008 01:55:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 14 Jan 2008 01:55:25 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 14 02:55:48 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 1JEEYC-0004qb-F5 for ged-emacs-devel@m.gmane.org; Mon, 14 Jan 2008 02:55:44 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEEXo-0000lH-EC for ged-emacs-devel@m.gmane.org; Sun, 13 Jan 2008 20:55:20 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JEEXk-0000kh-Dm for emacs-devel@gnu.org; Sun, 13 Jan 2008 20:55:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JEEXi-0000iL-1e for emacs-devel@gnu.org; Sun, 13 Jan 2008 20:55:15 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JEEXh-0000iB-Tk for emacs-devel@gnu.org; Sun, 13 Jan 2008 20:55:13 -0500 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JEEXh-0002me-Uj for emacs-devel@gnu.org; Sun, 13 Jan 2008 20:55:14 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ao8CAMNPikfO+KVp/2dsb2JhbACmXX0 X-IronPort-AV: E=Sophos;i="4.24,279,1196658000"; d="scan'208";a="12622912" Original-Received: from smtp.pppoe.ca ([65.39.196.238]) by ironport2-out.pppoe.ca with ESMTP; 13 Jan 2008 20:55:12 -0500 Original-Received: from pastel.home ([206.248.165.105]) by smtp.pppoe.ca (Internet Mail Server v1.0) with ESMTP id UCR84311; Sun, 13 Jan 2008 20:55:11 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 4D3568124; Sun, 13 Jan 2008 20:55:11 -0500 (EST) In-Reply-To: <200801140043.m0E0hqJ2006629@oogie-boogie.ics.uci.edu> (Dan Nicolaescu's message of "Sun, 13 Jan 2008 16:43:47 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. 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:86863 Archived-At: >> 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