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: Thu, 27 Dec 2018 18:38:09 +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="000000000000e6c936057e0469c8" X-Trace: blaine.gmane.org 1545932270 24742 195.159.176.226 (27 Dec 2018 17:37:50 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 27 Dec 2018 17:37:50 +0000 (UTC) To: 22663@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 27 18:37:46 2018 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 1gcZbN-0006Kv-Az for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Dec 2018 18:37:45 +0100 Original-Received: from localhost ([127.0.0.1]:54493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcZdU-0004es-50 for geb-bug-gnu-emacs@m.gmane.org; Thu, 27 Dec 2018 12:39:56 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcZcg-00047b-NS for bug-gnu-emacs@gnu.org; Thu, 27 Dec 2018 12:39:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gcZcc-0001Tc-7Z for bug-gnu-emacs@gnu.org; Thu, 27 Dec 2018 12:39:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39666) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gcZcc-0001TJ-2z for bug-gnu-emacs@gnu.org; Thu, 27 Dec 2018 12:39:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gcZcb-0006TG-VW for bug-gnu-emacs@gnu.org; Thu, 27 Dec 2018 12:39:02 -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: Thu, 27 Dec 2018 17:39:01 +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: patch Original-Received: via spool by 22663-submit@debbugs.gnu.org id=B22663.154593231424836 (code B ref 22663); Thu, 27 Dec 2018 17:39:01 +0000 Original-Received: (at 22663) by debbugs.gnu.org; 27 Dec 2018 17:38:34 +0000 Original-Received: from localhost ([127.0.0.1]:39518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gcZc9-0006SV-Ln for submit@debbugs.gnu.org; Thu, 27 Dec 2018 12:38:33 -0500 Original-Received: from mail-lj1-f169.google.com ([209.85.208.169]:46137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gcZc7-0006SF-Gk for 22663@debbugs.gnu.org; Thu, 27 Dec 2018 12:38:32 -0500 Original-Received: by mail-lj1-f169.google.com with SMTP id v15-v6so16809134ljh.13 for <22663@debbugs.gnu.org>; Thu, 27 Dec 2018 09:38:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=1qlERr/F3tWukOehTvMrChjdi4CRyChv/4fUh31O0V4=; b=UpNOffEElQNlD8gl5f/CveZFlEGJyfWcm9uM7KTSS3j13sgzV8o2mIy25EyYEKSyH/ q65Zmbbq+bdeEdcFUZFKJRtFljmmBjz02A3AZmCpvFUcCiLb6akZKEESXTBNPetsjzue HvwrTGgBf13ieRgolKbik2v5mNIP8GfPNrzZY4k6pq7K+Qm0id+8u2cdt9+IijFYhjE7 w8tC9qhuUxVi9KLVR6qxeBbNrwbhA2x4Z6+ASj1JdO5b0EnWbrVOyB3CSphBVpu4AHjG 8nYW++s3qMJAZsaYaLFXQKQ+HOxi5XFrEtaUOsKICkIyuiLJSvIxWaKIVqYMgxxqRmme q8Gw== X-Gm-Message-State: AJcUukeZMjNsAwtfc7eVdTteNwNIh/VHbo76IKCbNcYEulttI6oO93hR WdL1cwfwELVajetBOVsN81B9Mg8gGkSJwa+EacVCzLu4 X-Google-Smtp-Source: ALg8bN5Gpkqx7CX5x26hCpUhXR8h1Qqajp+ZCeSpBruuMoDLNSTjTICHP88rEpynyrBd++8LraDWE/nPI9P45g+gsAQ= X-Received: by 2002:a2e:1241:: with SMTP id t62-v6mr12363864lje.171.1545932305247; Thu, 27 Dec 2018 09:38:25 -0800 (PST) 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:153920 Archived-At: --000000000000e6c936057e0469c8 Content-Type: text/plain; charset="UTF-8" It looks like the bug still exists in Emacs 26.1 and on latest master. Attached is an updated patch with change log entries in the commit message on suggested by https://www.gnu.org/software/emacs/manual/html_node/emacs/Sending-Patches.html#Sending-Patches. Please also note that the patch includes a test case update that verifies that the bug has been fixed. -- Joel --000000000000e6c936057e0469c8 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Fix-electric-indent-bug-in-python-mode-after-dedenti.patch" Content-Disposition: attachment; filename="0001-Fix-electric-indent-bug-in-python-mode-after-dedenti.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jq6w5o0v0 RnJvbSAwNzgxNjhjODYwNTVkNWIxMTdkZWU0Njc0MDM4MTkwODIxZGY2NzRhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2VsIFJvc2RhaGwgPGpvZWxAcm9zZGFobC5uZXQ+CkRhdGU6 IFRodSwgMjcgRGVjIDIwMTggMTY6NTI6MDcgKzAxMDAKU3ViamVjdDogW1BBVENIXSBGaXggZWxl Y3RyaWMgaW5kZW50IGJ1ZyBpbiBweXRob24tbW9kZSBhZnRlciBkZWRlbnRpbmcgY29sb24KCiog bGlzdC9wcm9nbW9kZXMvcHl0aG9uLmVsIChweXRob24taW5kZW50LXBvc3Qtc2VsZi1pbnNlcnQt ZnVuY3Rpb24pOgogIFVzZSBtYXJrZXJzIGluc3RlYWQgb2YgcG9zaXRpb25zIHdoZW4gcmVpbmRl bnRpbmcgc3RhdGVtZW50KHMpIGFmdGVyCiAgaW5zZXJ0aW5nIGVsZWN0cmljIGNvbG9uIHRvIGF2 b2lkIHJlaW5kZW50aW5nIHRvbyBtYW55CiAgc3RhdGVtZW50cyAoYnVnIzIyNjYzKS4KCiogdGVz dC9saXNwL3Byb2dtb2Rlcy9weXRob24tdGVzdHMuZWwgKHB5dGhvbi1pbmRlbnQtZWxlY3RyaWMt Y29sb24tMik6CiAgSW1wcm92ZSB0ZXN0IGNhc2UgdG8gYWxzbyB2ZXJpZnkgdGhlIGZpeCBvZiBi dWcjMjI2NjMuCi0tLQogbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsICAgICAgICAgICAgfCAxOSAr KysrKysrKysrLS0tLS0tLS0tCiB0ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbCB8 ICAzICsrKwogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBiL2xpc3AvcHJvZ21vZGVz L3B5dGhvbi5lbAppbmRleCA2NTRhMGQzYWVhLi4wYmRlMWZiOGRiIDEwMDY0NAotLS0gYS9saXNw L3Byb2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsCkBAIC0x MzM0LDE2ICsxMzM0LDE3IEBAIHRoZSBsaW5lIHdpbGwgYmUgcmUtaW5kZW50ZWQgYXV0b21hdGlj YWxseSBpZiBuZWVkZWQuIgogICAgICAgICAgICAobm90IChlcXVhbCA/OiAoY2hhci1iZWZvcmUg KDEtIChwb2ludCkpKSkpCiAgICAgICAgICAgIChub3QgKHB5dGhvbi1zeW50YXgtY29tbWVudC1v ci1zdHJpbmctcCkpKQogICAgICAgOzsgSnVzdCByZS1pbmRlbnQgZGVkZW50ZXJzCi0gICAgICAo bGV0ICgoZGVkZW50ZXItcG9zIChweXRob24taW5mby1kZWRlbnRlci1zdGF0ZW1lbnQtcCkpCi0g ICAgICAgICAgICAoY3VycmVudC1wb3MgKHBvaW50KSkpCisgICAgICAobGV0ICgoZGVkZW50ZXIt cG9zIChweXRob24taW5mby1kZWRlbnRlci1zdGF0ZW1lbnQtcCkpKQogICAgICAgICAod2hlbiBk ZWRlbnRlci1wb3MKLSAgICAgICAgICAoc2F2ZS1leGN1cnNpb24KLSAgICAgICAgICAgIChnb3Rv LWNoYXIgZGVkZW50ZXItcG9zKQotICAgICAgICAgICAgKHB5dGhvbi1pbmRlbnQtbGluZSkKLSAg ICAgICAgICAgICh1bmxlc3MgKD0gKGxpbmUtbnVtYmVyLWF0LXBvcyBkZWRlbnRlci1wb3MpCi0g ICAgICAgICAgICAgICAgICAgICAgIChsaW5lLW51bWJlci1hdC1wb3MgY3VycmVudC1wb3MpKQot ICAgICAgICAgICAgICA7OyBSZWluZGVudCByZWdpb24gaWYgdGhpcyBpcyBhIG11bHRpbGluZSBz dGF0ZW1lbnQKLSAgICAgICAgICAgICAgKHB5dGhvbi1pbmRlbnQtcmVnaW9uIGRlZGVudGVyLXBv cyBjdXJyZW50LXBvcykpKSkpKSkpKQorICAgICAgICAgIChsZXQgKChzdGFydCAoY29weS1tYXJr ZXIgZGVkZW50ZXItcG9zKSkKKyAgICAgICAgICAgICAgICAoZW5kIChwb2ludC1tYXJrZXIpKSkK KyAgICAgICAgICAgIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAoZ290by1jaGFyIHN0 YXJ0KQorICAgICAgICAgICAgICAocHl0aG9uLWluZGVudC1saW5lKQorICAgICAgICAgICAgICAo dW5sZXNzICg9IChsaW5lLW51bWJlci1hdC1wb3Mgc3RhcnQpCisgICAgICAgICAgICAgICAgICAg ICAgICAgKGxpbmUtbnVtYmVyLWF0LXBvcyBlbmQpKQorICAgICAgICAgICAgICAgIDs7IFJlaW5k ZW50IHJlZ2lvbiBpZiB0aGlzIGlzIGEgbXVsdGlsaW5lIHN0YXRlbWVudAorICAgICAgICAgICAg ICAgIChweXRob24taW5kZW50LXJlZ2lvbiBzdGFydCBlbmQpKSkpKSkpKSkpCiAKIAwKIDs7OyBN YXJrCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbCBiL3Rl c3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCmluZGV4IDBiOWY4NDg0YzEuLjNiZTNl ZjZjYzcgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCisr KyBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCkBAIC0xMTYxLDEwICsxMTYx LDEzIEBAIGRlZiBiKCkKIGlmIGRvOgogICAgIHNvbWV0aGluZygpCiAgICAgZWxzZQorb3V0c2lk ZQogIgogICAgKHB5dGhvbi10ZXN0cy1sb29rLWF0ICJlbHNlIikKICAgIChnb3RvLWNoYXIgKGxp bmUtZW5kLXBvc2l0aW9uKSkKICAgIChweXRob24tdGVzdHMtc2VsZi1pbnNlcnQgIjoiKQorICAg KHNob3VsZCAoPSAoY3VycmVudC1pbmRlbnRhdGlvbikgMCkpCisgICAocHl0aG9uLXRlc3RzLWxv b2stYXQgIm91dHNpZGUiKQogICAgKHNob3VsZCAoPSAoY3VycmVudC1pbmRlbnRhdGlvbikgMCkp KSkKIAogKGVydC1kZWZ0ZXN0IHB5dGhvbi1pbmRlbnQtZWxlY3RyaWMtY29sb24tMyAoKQotLSAK Mi4xNy4xCgo= --000000000000e6c936057e0469c8--