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 13:43:19 +0100 Message-ID: <54F6FDE7.1080807@yahoo.fr> References: <54F512BE.5090705@dancol.org> <874mq2z1n4.fsf@yahoo.fr> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090902090005000909070400" X-Trace: ger.gmane.org 1425472989 18590 80.91.229.3 (4 Mar 2015 12:43:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 Mar 2015 12:43:09 +0000 (UTC) Cc: Daniel Colascione , Emacs developers To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 04 13:43:07 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 1YT8dk-0002TO-JQ for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 13:43:04 +0100 Original-Received: from localhost ([::1]:43608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT8dk-0008Ii-4U for ged-emacs-devel@m.gmane.org; Wed, 04 Mar 2015 07:43:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60195) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT8dN-0008Dt-QP for emacs-devel@gnu.org; Wed, 04 Mar 2015 07:42:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YT8dJ-0001pe-Hh for emacs-devel@gnu.org; Wed, 04 Mar 2015 07:42:41 -0500 Original-Received: from mxin.ulb.ac.be ([164.15.128.112]:7235) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT8dJ-0001o0-Bv for emacs-devel@gnu.org; Wed, 04 Mar 2015 07:42:37 -0500 Original-Received: from mathsrv4.ulb.ac.be (HELO [172.19.79.241]) ([164.15.133.241]) by smtp.ulb.ac.be with ESMTP; 04 Mar 2015 13:42:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 In-Reply-To: X-TagToolbar-Keys: D20150304134319835 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:183635 Archived-At: This is a multi-part message in MIME format. --------------090902090005000909070400 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Le 03/03/2015 17:43, Stefan Monnier a écrit : >> It seems you should set smerge-auto-leave to nil. Are you saying it >> should be the default ? I would agree because the automated turn-off is >> a bit surprising. Or it should maybe be documented in the docstring of >> smerge-mode itself. > > I don't have a strong opinion on this. I defaulted it to t because > I personally like this feature (I look at the mode line to know > if there are conflicts left, and I use an smerge-prefix that is mildly > annoying for "normal" editing, so turning it off early helps me avoid > key conflicts). I think documenting is necessary and sufficient ; I attach a suggestion. Nicolas. --------------090902090005000909070400 Content-Type: text/x-patch; name="0001-lisp-vc-smerge-mode.el-smerge-mode-Document-smerge-a.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename*0="0001-lisp-vc-smerge-mode.el-smerge-mode-Document-smerge-a.pa"; filename*1="tch" >From 702515a2955aef59bf2cda5f0611bbfb78a5cec0 Mon Sep 17 00:00:00 2001 From: Nicolas Richard Date: Wed, 4 Mar 2015 09:52:11 +0100 Subject: [PATCH] * lisp/vc/smerge-mode.el (smerge-mode): Document `smerge-auto-leave'. --- lisp/ChangeLog | 3 +++ lisp/vc/smerge-mode.el | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c04663..b68bce1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,6 @@ +2015-03-04 Nicolas Richard + + * vc/smerge-mode.el (smerge-mode): Document `smerge-auto-leave'. 2015-03-04 Rüdiger Sonderfeld * net/eww.el (eww-search-prefix, eww-open-file, eww-search-words) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 9f9224c..0d78201 100644 --- 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 +resolved. You can customize `smerge-auto-leave' to control this +behaviour. \\{smerge-mode-map}" :group 'smerge :lighter " SMerge" (when (and (boundp 'font-lock-mode) font-lock-mode) -- 2.1.4 --------------090902090005000909070400--