From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicolas Richard Newsgroups: gmane.emacs.devel Subject: Re: smerge-mode is fantastic, but it annoys me Date: Fri, 06 Mar 2015 05:24:10 +0100 Message-ID: <87r3t2kb2t.fsf@yahoo.fr> References: <54F512BE.5090705@dancol.org> <874mq2z1n4.fsf@yahoo.fr> <54F6FDE7.1080807@yahoo.fr> <87a8zs2a67.fsf@violet.siamics.net> <87twy0yhk4.fsf@yahoo.fr> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1425615884 16368 80.91.229.3 (6 Mar 2015 04:24:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 6 Mar 2015 04:24:44 +0000 (UTC) Cc: Nicolas Richard , Emacs developers To: John Yates Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 06 05:24:34 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YTjoO-00063D-MD for ged-emacs-devel@m.gmane.org; Fri, 06 Mar 2015 05:24:32 +0100 Original-Received: from localhost ([::1]:56162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTjoN-0007ni-PZ for ged-emacs-devel@m.gmane.org; Thu, 05 Mar 2015 23:24:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTjo9-0007mG-Qz for emacs-devel@gnu.org; Thu, 05 Mar 2015 23:24:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTjo5-0000Nb-0n for emacs-devel@gnu.org; Thu, 05 Mar 2015 23:24:17 -0500 Original-Received: from mailrelay102.isp.belgacom.be ([195.238.20.129]:31753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTjo4-0000My-RE for emacs-devel@gnu.org; Thu, 05 Mar 2015 23:24:12 -0500 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=+BsAzE94k0WpM8AtezFGaEXBVpw1lpSE4R7UN5Nfg4g= c=1 sm=2 a=a4K5GIyuExAA:10 a=P-ICsynqAAAA:8 a=_mX4zVq_cFjLgwqiSwcA:9 Original-Received: from 239.187-177-91.adsl-dyn.isp.belgacom.be (HELO LDLC-portable) ([91.177.187.239]) by relay.skynet.be with ESMTP; 06 Mar 2015 05:24:10 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 195.238.20.129 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:183686 Archived-At: John Yates writes: > On Wed, Mar 4, 2015 at 9:15 AM, Nicolas Richard > wrote: > > > The mode will turn itself off after the last conflict is > resolved, if the variable `smerge-auto-leave' is non-nil. > > > I find it clearer to list pre-conditions first and then causes before > effects: That also crossed my mind, but when I re-read it, I thought that the effect is more important than the condition (because the effect is what happens by default, and is surprising wrt how other modes behave). -- Nicolas