From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Yates Newsgroups: gmane.emacs.devel Subject: Re: smerge-mode is fantastic, but it annoys me Date: Wed, 4 Mar 2015 11:33:12 -0500 Message-ID: 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: multipart/alternative; boundary=089e0116057ae4c96b05107901e5 X-Trace: ger.gmane.org 1425486819 2043 80.91.229.3 (4 Mar 2015 16:33:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Mar 2015 16:33:39 +0000 (UTC) Cc: Emacs developers To: Nicolas Richard Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 04 17:33:37 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 1YTCEp-0007Er-3W for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 17:33:35 +0100 Original-Received: from localhost ([::1]:45062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTCEo-00067h-J0 for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 11:33:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTCEZ-00067b-Iv for emacs-devel@gnu.org; Wed, 04 Mar 2015 11:33:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTCET-0001j9-Ci for emacs-devel@gnu.org; Wed, 04 Mar 2015 11:33:19 -0500 Original-Received: from mail-yh0-x234.google.com ([2607:f8b0:4002:c01::234]:43471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTCET-0001iw-95 for emacs-devel@gnu.org; Wed, 04 Mar 2015 11:33:13 -0500 Original-Received: by yhab6 with SMTP id b6so22627458yha.10 for ; Wed, 04 Mar 2015 08:33:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=D5EHqSXkBa7ho6PO7j4Dj+L4svRg2L/pu2AS/fsrO9g=; b=Mz1f0F7Gew9ZefRkGlH75oDO3SUCPEGKyKoqJsEDZ5FO5bSx47GQzv9vaEOHMsx3jk AbP2mTCObGxjoZzGHzFTxSU+5/I+HZtys+4FC+jkU1foxAfCNKHZB3EgbLoZnF4W4yiQ RhDauUF74k3hUjRd/bPb/PKEZrT80CFWimRHtnM/xgzf5cRu9K+H+z/AZjX80UWiLBec KsxvHEc4voH3VHu8NK+pcV30Okb5Wc8DdSHzsJ3KTaBU4wi0zWVilITKXUmuN//5jRNO a9g1tlbHRpO2R6fFbs6kor8WsiVAYeGuXgZNWZWzYKaMA96CPDrcNBcTf75ZrEiM/pH/ rgew== X-Received: by 10.236.53.65 with SMTP id f41mr3326185yhc.182.1425486792409; Wed, 04 Mar 2015 08:33:12 -0800 (PST) Original-Received: by 10.170.35.197 with HTTP; Wed, 4 Mar 2015 08:33:12 -0800 (PST) In-Reply-To: <87twy0yhk4.fsf@yahoo.fr> X-Google-Sender-Auth: mXDkalOg0tcyGjO1BXtJBucBNP8 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c01::234 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:183641 Archived-At: --089e0116057ae4c96b05107901e5 Content-Type: text/plain; charset=UTF-8 On Wed, Mar 4, 2015 at 9:15 AM, Nicolas Richard < theonewiththeevillook@yahoo.fr> 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: If `smerge-auto-leave' is non-nil then as soon as the last conflict is resolved smerge-mode turns itself off. /john --089e0116057ae4c96b05107901e5 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On W= ed, Mar 4, 2015 at 9:15 AM, Nicolas Richard <theonewiththee= villook@yahoo.fr> wrote:
The mode will tu= rn 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 t= hen causes before effects:

If `smerge-auto-leave&#= 39; is non-nil then as soon as the last conflict is resolved smerge-mode tu= rns itself off.

/john

--089e0116057ae4c96b05107901e5--