From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Barry Warsaw Newsgroups: gmane.emacs.devel Subject: Re: smerge-mode is fantastic, but it annoys me Date: Tue, 3 Mar 2015 09:53:33 -0500 Organization: Damn Crazy Followers of the Horn Message-ID: <20150303095333.6dea82e2@anarchist.wooz.org> References: <54F512BE.5090705@dancol.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/uYESsdRFL2GaXPv84/n0h31"; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1425394450 1419 80.91.229.3 (3 Mar 2015 14:54:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Mar 2015 14:54:10 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 03 15:54:02 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 1YSoCs-0002ur-SY for ged-emacs-devel@m.gmane.org; Tue, 03 Mar 2015 15:53:59 +0100 Original-Received: from localhost ([::1]:39093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSoCs-0003Sv-Cj for ged-emacs-devel@m.gmane.org; Tue, 03 Mar 2015 09:53:58 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSoCl-0003Ke-Er for emacs-devel@gnu.org; Tue, 03 Mar 2015 09:53:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSoCi-0006PQ-9D for emacs-devel@gnu.org; Tue, 03 Mar 2015 09:53:51 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:59599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSoCi-0006PA-0U for emacs-devel@gnu.org; Tue, 03 Mar 2015 09:53:48 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YSoCf-0002n5-5R for emacs-devel@gnu.org; Tue, 03 Mar 2015 15:53:45 +0100 Original-Received: from mail.wooz.org ([216.15.33.194]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 Mar 2015 15:53:45 +0100 Original-Received: from barry by mail.wooz.org with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 03 Mar 2015 15:53:45 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 41 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: mail.wooz.org X-Newsreader: Claws Mail 3.11.1 (GTK+ 2.24.26; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:183593 Archived-At: --Sig_/uYESsdRFL2GaXPv84/n0h31 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Mar 02, 2015, at 05:47 PM, Daniel Colascione wrote: >smerge-mode is handy for resolving conflicts, but it's annoying that >after resolving them all, smerge turns itself off, and C-c ^ n starts >inserting stray "n" characters in the buffer. Can we just leave smerge >on after resolving conflicts? Me too! I didn't know about smerge-auto-leave, so I'm giving that a try (thanks Nicolas!). Now to generate some conflicts... Cheers, -Barry --Sig_/uYESsdRFL2GaXPv84/n0h31 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJU9crtAAoJEBJutWOnSwa/QQ4QAMKyKEF55jfFdHUIeruRHR2/ Sps7IHiOigLRJtQfqeopEZ74datKMjI9+EtwyLMCpRHNheeqPnBpY6hdV+UlQL0P M2G+kE8PP0m4/p5rQUhKqmPGAjovSeJLl1NCJKrobARXVzeKCiftTI5o6pQdQ3vy XHmp7zJQKSORehMsfZc5GApFk7HbZV0fErdrTyn9ixZXtHRZRknnrgbrJey/4q5y PQ/S7ooM5VEohdl2LxKTzi9XbJKca76CXXW+980BmeCS1tVITDkoWMhoenV6cC4u qq+shDCmK5kPD16nk4ymUapQ7q952mcIOBYZipHMOhxGCiSRUMvq1LOja9uZWBGq cQQ9eJwtFikXGRGLf6WNfJux/vl2nEzJK3bTGLImspV55TPNSPtMoPXrYWQcLZzA eUr1rTeZ42V3R0GXP1zO0MgTOAm3m89w9jgZ62yuM5HvNTwHDZoHCWKmkF725na+ bKEXEILLMkCkWFstrxvmHsA480Nl2698hKChRZ1n4O8R9wbb1xqDBrmMqM8b3YDd VrFxfoL07XR/J9rNoAHX0YM6+qJVtortYVC8x+keSZPMrPrbxlaLKf1Cyg6csQiV SKOeToILFw3jBW2L8kUOhPpQugZryJuTkEtn5QBLD39gX/qeVqj6a7xsFnefTfKg 2fS399Tc+EEGEoc+jj77 =qPRQ -----END PGP SIGNATURE----- --Sig_/uYESsdRFL2GaXPv84/n0h31--