From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ivan Shmakov Newsgroups: gmane.emacs.devel Subject: Re: smerge-mode is fantastic, but it annoys me Date: Wed, 04 Mar 2015 12:56:32 +0000 Message-ID: <87a8zs2a67.fsf@violet.siamics.net> References: <54F512BE.5090705@dancol.org> <874mq2z1n4.fsf@yahoo.fr> <54F6FDE7.1080807@yahoo.fr> 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 1425473848 1243 80.91.229.3 (4 Mar 2015 12:57:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Mar 2015 12:57:28 +0000 (UTC) To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 04 13:57:20 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 1YT8rY-000220-4L for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 13:57:20 +0100 Original-Received: from localhost ([::1]:43654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT8rX-0005eL-Jm for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 07:57:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT8rA-0005TH-KB for emacs-devel@gnu.org; Wed, 04 Mar 2015 07:56:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YT8r8-0007IC-N6 for emacs-devel@gnu.org; Wed, 04 Mar 2015 07:56:56 -0500 Original-Received: from fely.am-1.org ([2a01:4f8:d15:1b86::2]:40483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT8r8-0007EQ-EE for emacs-devel@gnu.org; Wed, 04 Mar 2015 07:56:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=siamics.net; s=a2013295; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:In-Reply-To:Date:Sender:References:Subject:To:From; bh=wy4lrdJzV4nWGP3/uRYMK9E3j6/xP8ntsHDG12JzWPo=; b=eGo77CXAl3JvADy/bLntGPrJd4TJ1OkDWg+kRNdvHnFVJKkMtQrA68JA9L3adjQJ/osxyQ3n91MGWcxi8P4z2qFp2rxUvhM9KvF7JHErsTrL89OR76XOKLPvevAf+XnMPIdwVKS0AYndOp4crMssFqSNQDL4R4sDgsg3wavECZ0=; Original-Received: from [2a02:2560:6d4:26ca::1:1d] (helo=violet.siamics.net) by fely.am-1.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YT8qx-0004Ml-2N for emacs-devel@gnu.org; Wed, 04 Mar 2015 12:56:43 +0000 Original-Received: from localhost ([::1] helo=violet.siamics.net) by violet.siamics.net with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1YT8qn-0001lG-H9 for emacs-devel@gnu.org; Wed, 04 Mar 2015 19:56:33 +0700 Mail-Followup-To: Emacs developers In-Reply-To: <54F6FDE7.1080807@yahoo.fr> (Nicolas Richard's message of "Wed, 04 Mar 2015 13:43:19 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:d15:1b86::2 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:183637 Archived-At: >>>>> Nicolas Richard writes: [=E2=80=A6] > --- a/lisp/vc/smerge-mode.el > +++ b/lisp/vc/smerge-mode.el > @@ -1335,6 +1335,10 @@ define-minor-mode smerge-mode > With a prefix argument ARG, enable the mode if ARG is positive, > and disable it otherwise. If called from Lisp, enable the mode > if ARG is omitted or nil. > + > +The mode will turn itself off after the last conflict was s/was/is/. > +resolved. You can customize `smerge-auto-leave' to control this > +behaviour. s/behaviour/behavior/. 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/ that= would be a (conventional) link. --=20 FSF associate member #7257 np. Play Your Part =E2=80=94 Flotsam and Jetsam= 230E 334A