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: Wed, 04 Mar 2015 15:15:55 +0100 Message-ID: <87twy0yhk4.fsf@yahoo.fr> References: <54F512BE.5090705@dancol.org> <874mq2z1n4.fsf@yahoo.fr> <54F6FDE7.1080807@yahoo.fr> <87a8zs2a67.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1425478612 21527 80.91.229.3 (4 Mar 2015 14:16:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Mar 2015 14:16:52 +0000 (UTC) To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 04 15:16:44 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 1YTA6N-0007I5-6t for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 15:16:43 +0100 Original-Received: from localhost ([::1]:44259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTA6L-00077A-Pw for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 09:16:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTA4x-0005dN-Rc for emacs-devel@gnu.org; Wed, 04 Mar 2015 09:15:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTA4t-0006HY-9e for emacs-devel@gnu.org; Wed, 04 Mar 2015 09:15:15 -0500 Original-Received: from mxin.ulb.ac.be ([164.15.128.112]:39236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTA4s-0006Ck-VK for emacs-devel@gnu.org; Wed, 04 Mar 2015 09:15:11 -0500 Original-Received: from mathsrv4.ulb.ac.be (HELO localhost) ([164.15.133.241]) by smtp.ulb.ac.be with ESMTP; 04 Mar 2015 15:15:09 +0100 In-Reply-To: <87a8zs2a67.fsf@violet.siamics.net> (Ivan Shmakov's message of "Wed, 04 Mar 2015 12:56:32 +0000") 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: 164.15.128.112 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:183639 Archived-At: Ivan Shmakov writes: > But perhaps we should shorten this down to something like =E2=80=9C=E2= =80=A6 if > `smerge-auto-leave' is non-nil=E2=80=9D? There still would be > =E2=80=9Ccustomize=E2=80=9D in the variable=E2=80=99s own help, /and/ th= at would be a > (conventional) link. Ok thanks. What about this ? The mode will turn itself off after the last conflict is resolved, if the variable `smerge-auto-leave' is non-nil. (I added the word "variable" to avoid linking to the function.) --=20 Nicolas Richard