From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Colascione Newsgroups: gmane.emacs.devel Subject: smerge-mode is fantastic, but it annoys me Date: Mon, 02 Mar 2015 17:47:42 -0800 Message-ID: <54F512BE.5090705@dancol.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="bsCNTAOswhQ9wSBaSWw3k9373IQIAqQSm" X-Trace: ger.gmane.org 1425347287 27802 80.91.229.3 (3 Mar 2015 01:48:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Mar 2015 01:48:07 +0000 (UTC) To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 03 02:48:06 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 1YSbwM-0004YQ-7R for ged-emacs-devel@m.gmane.org; Tue, 03 Mar 2015 02:48:06 +0100 Original-Received: from localhost ([::1]:32875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSbwL-0006ch-GA for ged-emacs-devel@m.gmane.org; Mon, 02 Mar 2015 20:48:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSbwI-0006ZW-7t for emacs-devel@gnu.org; Mon, 02 Mar 2015 20:48:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSbwC-0006lD-43 for emacs-devel@gnu.org; Mon, 02 Mar 2015 20:48:02 -0500 Original-Received: from dancol.org ([2600:3c01::f03c:91ff:fedf:adf3]:56348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSbwB-0006jq-QJ for emacs-devel@gnu.org; Mon, 02 Mar 2015 20:47:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dancol.org; s=x; h=Content-Type:Subject:To:MIME-Version:From:Date:Message-ID; bh=WkvHd0cKJhncFU4e/MWIoB8ZMQy0SF+41H8IZtzcSMI=; b=W079R/aFfYE2E5OmBYp+ixRwlb6SwOYc8hzdViEmPuTIT6TcRGCZXHTGZhM54tKp8mGcOHivxX7ZKiGrXyw95I+W4x3wOVzIy6EHv0o3cZFusmO4TSsac1HNUPiTjcts+kvfSNSguMQxhe86HssMNUt1w9MybKk0LkonA56HOXxL8+KWMVBciRV6fkB0F+A7z1bOJB/stIsCxlnlfmeTnOQGxzvHYZdZoRkqzfEpmJO2pvNZ+NvR0dUlSs0ptbHXTZA9NFQiLA2S79QGFyoOvxdA0PwfNU4bP68F7wkUtCD+5J/w+IOkyPS+UJeEhNjQrQHkMb7a+8dTICz8ivw+rw==; Original-Received: from [2620:10d:c081:1100:8000::2120] by dancol.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1YSbw4-0002ob-06 for emacs-devel@gnu.org; Mon, 02 Mar 2015 17:47:48 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2600:3c01::f03c:91ff:fedf:adf3 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:183588 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --bsCNTAOswhQ9wSBaSWw3k9373IQIAqQSm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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? --bsCNTAOswhQ9wSBaSWw3k9373IQIAqQSm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJU9RK+AAoJEN4WImmbpWBleeYQAKp7cIH+eH5ro2Ws+wSNbG5P Q44EDlaIeCEngqyEbRpacw3YxXrf7MNuUzRKLfX6DVJ8Qtcb0jrIj/tQc9ov0dmd 5npsEFZl7Ak8OjR8OKbOtauMKktKXnMhDuSKPasEawgiCwD6nBDucTp9FMfnCLV6 W6G5iZEixGWm7MD4MT5M/exh3yOvy6iq0aVDailHgzztSvZ7SrmasdRKMK2y26eM JlVtMEFFqnSznveBOZRozUxRG+0FZElcESK+1H0i9Zbe6W63EfG5x5p5B40EmKtH aeTJTuh8jV13T/BDC9YJ2sGaSFLvWYbBpm04r/fpPPx9a52/F23J4jfNBbVLEPIu 5WMMaZLV+JWDJl107j4tBtTjawmnj8Qxy8oI/t3o81z29I2qu3wpPanz0OkMKLZC Px4kv9zCBHiY8Tb7m8ZuW6pSF4wdFGyJqxoIqy76CV+4AUsnKKm8LJC7YAYPdnES sXkdJ4EubrEkUNX8nOMLy7gg3EKuRQzGCCHfb9SV/trDcoNpqTZqhxz5ZImhJugx UBQvCQeXx9b1gS99NLRYceg+OirZO5X27wHr73SSgJBl74sErxD1lz8KmXzPBeNo 89rZBFnsWe6UIopiEI/x0GKBfL9AFbrZOBbgGNOzPQ6zYgzXZJO66ddaoSWuqAs9 NTXpeJRA7DR7Y+4foHK4 =ptF9 -----END PGP SIGNATURE----- --bsCNTAOswhQ9wSBaSWw3k9373IQIAqQSm--