From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Joel Rosdahl Newsgroups: gmane.emacs.bugs Subject: bug#22663: python-mode: Fix electric indent bug after dedenting colon Date: Sun, 12 Feb 2017 16:11:41 +0100 Message-ID: References: <877fi7z041.fsf@golux.woodcraft.me.uk> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a1143e4cecb4789054856c0c6 X-Trace: blaine.gmane.org 1486920802 13643 195.159.176.226 (12 Feb 2017 17:33:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 12 Feb 2017 17:33:22 +0000 (UTC) To: 22663@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 12 18:33:14 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ccy1P-0002sR-Jc for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Feb 2017 18:33:11 +0100 Original-Received: from localhost ([::1]:52876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccy1V-00087P-9g for geb-bug-gnu-emacs@m.gmane.org; Sun, 12 Feb 2017 12:33:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccy1K-00085m-ID for bug-gnu-emacs@gnu.org; Sun, 12 Feb 2017 12:33:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ccy1H-0001Qv-Cx for bug-gnu-emacs@gnu.org; Sun, 12 Feb 2017 12:33:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39048) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ccy1H-0001Qr-9e for bug-gnu-emacs@gnu.org; Sun, 12 Feb 2017 12:33:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ccy1H-0002DS-3t for bug-gnu-emacs@gnu.org; Sun, 12 Feb 2017 12:33:03 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <877fi7z041.fsf@golux.woodcraft.me.uk> Resent-From: Joel Rosdahl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 12 Feb 2017 17:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22663-submit@debbugs.gnu.org id=B22663.14869207718484 (code B ref 22663); Sun, 12 Feb 2017 17:33:03 +0000 Original-Received: (at 22663) by debbugs.gnu.org; 12 Feb 2017 17:32:51 +0000 Original-Received: from localhost ([127.0.0.1]:37245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ccy15-0002Cm-AA for submit@debbugs.gnu.org; Sun, 12 Feb 2017 12:32:51 -0500 Original-Received: from mail-it0-f51.google.com ([209.85.214.51]:34240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ccvou-0005ek-2S for 22663@debbugs.gnu.org; Sun, 12 Feb 2017 10:12:08 -0500 Original-Received: by mail-it0-f51.google.com with SMTP id k200so851181itb.1 for <22663@debbugs.gnu.org>; Sun, 12 Feb 2017 07:12:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=t+KnKw9xl5WleTHGCToUWifcMig/VFAMi2eOCRLTsow=; b=VASmIe19SWQyIi+4e2QMKMF9WysIRm1dtkJDNeNcbnt+tcaxDNBVHtPsvBdpvDsDj0 gPhy5cXwHa/ge9+70polPy3vnWGuS5cwUNVNtsNeXQSCRyu6wgcRh549Sqmeidr832uZ KJTCnIx0Nv6DTcNJyx0iRV7AZgsqghnrS1zj/9WfmW1rUoV2cr0eqy0/PYqPawzq7WrZ Tbiz9zvKUfcWIAskneJ5Qf18E7IwwR5LAvEwE/kVlX1VrqgLKnd1i8RfF8Cjc03GDM0r /Ary0xLBd9FTad2xpbl4hkBPgIJdVo296hR7AmSPVd5BvW46seLJQfmD7dAfowvPzP0+ dWkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=t+KnKw9xl5WleTHGCToUWifcMig/VFAMi2eOCRLTsow=; b=k/ALtAkR2ToUwQqxuTm2y0kUEAdLBsLE6z2z2bNUwIh8aAFzgY6ZUP8y7jJ7uYnPCL SvSPZS4Yv/EWXtDqatYsfiiYj6ix4cDfQKSG4DUtr6rRv/KHlLlvR8te9A6lzgrAL98I gqONR/Y7RbNf7jTHqoNlLqqBpcHFy2nSb15/Xcvg2NOmfz0xsFjPXcKIJnh9wKGl3NHX SmjFPM+6TRQsy7LUb7cg8iuXkAEwu1/tIrCaAyV43WwABFqv7lTnpA/umExsk6V3dKY0 BG8rmW0rRsRQIsPaHeMZQLS02viVao5ydiYcIu7xW/2JjsrGSIT3Wy8+XbpBx5D9lX6B lAyQ== X-Gm-Message-State: AIkVDXJBMzAP7qceOoRmb8K7ioO1BbbVwnYUx1n5pAmOOCeJFqA+WZ8W+A9gtjbgDeY0kKaoE2ytSPL+qJpN9A== X-Received: by 10.36.10.3 with SMTP id 3mr35648126itw.108.1486912322460; Sun, 12 Feb 2017 07:12:02 -0800 (PST) Original-Received: by 10.64.167.244 with HTTP; Sun, 12 Feb 2017 07:11:41 -0800 (PST) X-Google-Sender-Auth: w_D6j4ibl0CZr4rk5vdcStoylsw X-Mailman-Approved-At: Sun, 12 Feb 2017 12:32:51 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:129268 Archived-At: --001a1143e4cecb4789054856c0c6 Content-Type: multipart/alternative; boundary=001a1143e4cecb4784054856c0c4 --001a1143e4cecb4784054856c0c4 Content-Type: text/plain; charset=UTF-8 This fixes bug #22663 ("25.0.91; python.el electric-indent misbehaviour with 'except:'"). Note that the bug is not restricted to "except:" but affects all statements that are dedented by an electric colon. For instance, entering a colon after "else" in if do: something() else outside results in if do: something() else: outside before the bug fix but if do: something() else: outside after the bug fix. -- Joel --001a1143e4cecb4784054856c0c4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
This fixes bug #22663 ("25.0.91; python.el elect= ric-indent misbehaviour
with 'except:'"). Note that = the bug is not restricted to "except:" but
affects all = statements that are dedented by an electric colon.

For instance, entering a colon after "else" in

=C2=A0 =C2=A0 if do:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 somethin= g()
=C2=A0 =C2=A0 =C2=A0 =C2=A0 else
=C2=A0 =C2=A0 outs= ide

results in

=C2=A0 =C2= =A0 if do:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 something()
=C2= =A0 =C2=A0 else:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 outside
before the bug fix but

=C2=A0 =C2=A0 = if do:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 something()
=C2=A0 = =C2=A0 else:
=C2=A0 =C2=A0 outside

after= the bug fix.

-- Joel
--001a1143e4cecb4784054856c0c4-- --001a1143e4cecb4789054856c0c6 Content-Type: text/x-patch; charset=US-ASCII; name="0001-python-mode-Fix-electric-indent-bug-after-dedenting-.patch" Content-Disposition: attachment; filename="0001-python-mode-Fix-electric-indent-bug-after-dedenting-.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iz2t65pc0 RnJvbSA1NTVmYjQ3ZDBjMzA2MTM0NmMyNzkyZTk3MjA2YTBkNjRkZDFlNTc4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2VsIFJvc2RhaGwgPGpvZWxAcm9zZGFobC5uZXQ+CkRhdGU6 IFN1biwgMTIgRmViIDIwMTcgMTY6MTA6NDcgKzAxMDAKU3ViamVjdDogW1BBVENIXSBweXRob24t bW9kZTogRml4IGVsZWN0cmljIGluZGVudCBidWcgYWZ0ZXIgZGVkZW50aW5nIGNvbG9uCgpUaGlz IGZpeGVzIGJ1ZyAjMjI2NjMgKCIyNS4wLjkxOyBweXRob24uZWwgZWxlY3RyaWMtaW5kZW50IG1p c2JlaGF2aW91cgp3aXRoICdleGNlcHQ6JyIpLiBOb3RlIHRoYXQgdGhlIGJ1ZyBpcyBub3QgcmVz dHJpY3RlZCB0byAiZXhjZXB0OiIgYnV0CmFmZmVjdHMgYWxsIHN0YXRlbWVudHMgdGhhdCBhcmUg ZGVkZW50ZWQgYnkgYW4gZWxlY3RyaWMgY29sb24uCgpGb3IgaW5zdGFuY2UsIGVudGVyaW5nIGEg Y29sb24gYWZ0ZXIgImVsc2UiIGluCgogICAgaWYgZG86CiAgICAgICAgc29tZXRoaW5nKCkKICAg ICAgICBlbHNlCiAgICBvdXRzaWRlCgpyZXN1bHRzIGluCgogICAgaWYgZG86CiAgICAgICAgc29t ZXRoaW5nKCkKICAgIGVsc2U6CiAgICAgICAgb3V0c2lkZQoKYmVmb3JlIHRoZSBidWcgZml4IGJ1 dAoKICAgIGlmIGRvOgogICAgICAgIHNvbWV0aGluZygpCiAgICBlbHNlOgogICAgb3V0c2lkZQoK YWZ0ZXIgdGhlIGJ1ZyBmaXguCi0tLQogbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsICAgICAgICAg ICAgfCAxOSArKysrKysrKysrLS0tLS0tLS0tCiB0ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10 ZXN0cy5lbCB8ICAzICsrKwogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA5IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBiL2xpc3Av cHJvZ21vZGVzL3B5dGhvbi5lbAppbmRleCA5MGI1ZTRlLi40NjdhYzA4IDEwMDY0NAotLS0gYS9s aXNwL3Byb2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsCkBA IC0xMjg2LDE2ICsxMjg2LDE3IEBAIHB5dGhvbi1pbmRlbnQtcG9zdC1zZWxmLWluc2VydC1mdW5j dGlvbgogICAgICAgICAgICAobm90IChlcXVhbCA/OiAoY2hhci1iZWZvcmUgKDEtIChwb2ludCkp KSkpCiAgICAgICAgICAgIChub3QgKHB5dGhvbi1zeW50YXgtY29tbWVudC1vci1zdHJpbmctcCkp KQogICAgICAgOzsgSnVzdCByZS1pbmRlbnQgZGVkZW50ZXJzCi0gICAgICAobGV0ICgoZGVkZW50 ZXItcG9zIChweXRob24taW5mby1kZWRlbnRlci1zdGF0ZW1lbnQtcCkpCi0gICAgICAgICAgICAo Y3VycmVudC1wb3MgKHBvaW50KSkpCisgICAgICAobGV0ICgoZGVkZW50ZXItcG9zIChweXRob24t aW5mby1kZWRlbnRlci1zdGF0ZW1lbnQtcCkpKQogICAgICAgICAod2hlbiBkZWRlbnRlci1wb3MK LSAgICAgICAgICAoc2F2ZS1leGN1cnNpb24KLSAgICAgICAgICAgIChnb3RvLWNoYXIgZGVkZW50 ZXItcG9zKQotICAgICAgICAgICAgKHB5dGhvbi1pbmRlbnQtbGluZSkKLSAgICAgICAgICAgICh1 bmxlc3MgKD0gKGxpbmUtbnVtYmVyLWF0LXBvcyBkZWRlbnRlci1wb3MpCi0gICAgICAgICAgICAg ICAgICAgICAgIChsaW5lLW51bWJlci1hdC1wb3MgY3VycmVudC1wb3MpKQotICAgICAgICAgICAg ICA7OyBSZWluZGVudCByZWdpb24gaWYgdGhpcyBpcyBhIG11bHRpbGluZSBzdGF0ZW1lbnQKLSAg ICAgICAgICAgICAgKHB5dGhvbi1pbmRlbnQtcmVnaW9uIGRlZGVudGVyLXBvcyBjdXJyZW50LXBv cykpKSkpKSkpKQorICAgICAgICAgIChsZXQgKChzdGFydCAoY29weS1tYXJrZXIgZGVkZW50ZXIt cG9zKSkKKyAgICAgICAgICAgICAgICAoZW5kIChwb2ludC1tYXJrZXIpKSkKKyAgICAgICAgICAg IChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAoZ290by1jaGFyIHN0YXJ0KQorICAgICAg ICAgICAgICAocHl0aG9uLWluZGVudC1saW5lKQorICAgICAgICAgICAgICAodW5sZXNzICg9IChs aW5lLW51bWJlci1hdC1wb3Mgc3RhcnQpCisgICAgICAgICAgICAgICAgICAgICAgICAgKGxpbmUt bnVtYmVyLWF0LXBvcyBlbmQpKQorICAgICAgICAgICAgICAgIDs7IFJlaW5kZW50IHJlZ2lvbiBp ZiB0aGlzIGlzIGEgbXVsdGlsaW5lIHN0YXRlbWVudAorICAgICAgICAgICAgICAgIChweXRob24t aW5kZW50LXJlZ2lvbiBzdGFydCBlbmQpKSkpKSkpKSkpCiAKIAwKIDs7OyBNYXJrCmRpZmYgLS1n aXQgYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9wcm9n bW9kZXMvcHl0aG9uLXRlc3RzLmVsCmluZGV4IDFlNmI4NjcuLmU5MTE5MjEgMTAwNjQ0Ci0tLSBh L3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9wcm9n bW9kZXMvcHl0aG9uLXRlc3RzLmVsCkBAIC0xMTMwLDEwICsxMTMwLDEzIEBAIHB5dGhvbi10ZXN0 cy12aXNpYmxlLXN0cmluZwogaWYgZG86CiAgICAgc29tZXRoaW5nKCkKICAgICBlbHNlCitvdXRz aWRlCiAiCiAgICAocHl0aG9uLXRlc3RzLWxvb2stYXQgImVsc2UiKQogICAgKGdvdG8tY2hhciAo bGluZS1lbmQtcG9zaXRpb24pKQogICAgKHB5dGhvbi10ZXN0cy1zZWxmLWluc2VydCAiOiIpCisg ICAoc2hvdWxkICg9IChjdXJyZW50LWluZGVudGF0aW9uKSAwKSkKKyAgIChweXRob24tdGVzdHMt bG9vay1hdCAib3V0c2lkZSIpCiAgICAoc2hvdWxkICg9IChjdXJyZW50LWluZGVudGF0aW9uKSAw KSkpKQogCiAoZXJ0LWRlZnRlc3QgcHl0aG9uLWluZGVudC1lbGVjdHJpYy1jb2xvbi0zICgpCi0t IAoyLjcuNAoK --001a1143e4cecb4789054856c0c6--