From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#62031: 29.0.60; python-mode indentation after re.match Date: Wed, 8 Mar 2023 20:15:03 +0200 Message-ID: References: <5ea3a37a-4e43-4ede-9f96-7159f54272e8@yandex.ru> <87bkl4y5gw.fsf@metapensiero.it> <87wn3rk7bk.fsf@metapensiero.it> <69793abf-3d2f-2dbe-698b-877ededfc56b@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37643"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Cc: Rob Moss To: Lele Gaifax , 62031@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Mar 08 19:16:23 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pZyKs-0009dm-Sq for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 08 Mar 2023 19:16:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZyKa-0002bB-Gy; Wed, 08 Mar 2023 13:16:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZyKY-0002au-7m for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2023 13:16:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZyKX-0000fg-TV for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2023 13:16:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZyKX-0003me-OO for bug-gnu-emacs@gnu.org; Wed, 08 Mar 2023 13:16:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 08 Mar 2023 18:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62031 X-GNU-PR-Package: emacs Original-Received: via spool by 62031-submit@debbugs.gnu.org id=B62031.167829931314484 (code B ref 62031); Wed, 08 Mar 2023 18:16:01 +0000 Original-Received: (at 62031) by debbugs.gnu.org; 8 Mar 2023 18:15:13 +0000 Original-Received: from localhost ([127.0.0.1]:50195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZyJl-0003lY-F9 for submit@debbugs.gnu.org; Wed, 08 Mar 2023 13:15:13 -0500 Original-Received: from mail-ed1-f41.google.com ([209.85.208.41]:42872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZyJj-0003lI-AE for 62031@debbugs.gnu.org; Wed, 08 Mar 2023 13:15:11 -0500 Original-Received: by mail-ed1-f41.google.com with SMTP id o12so69217505edb.9 for <62031@debbugs.gnu.org>; Wed, 08 Mar 2023 10:15:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678299305; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to; bh=NEdEeZELmlW5pu4Rqj6AM4mq5SphObaBkCPduzxuLXg=; b=E5IqflYkUuPjwdiCeTNkgw0v4PeBCH777v1dGZGYGCVqMFlPCiQN5KXqltEkdTmvLL axqrMyUI83Ic9Mo7vEkRZI1V+IZkw8upY7wAeQ3oNggOa23VuTnUqOpPeXlo559C8k9w Fmi6JXSwKYrmCnCJl3gIChNtfykqSOJ3qBlfkin61Qf1/gTVImMKYQxlIJRmwp6KiUXq Pkhm47cbBsdEAQRIZ+NLztAPXt4fDpOO4JG+cd2obWLqkFeCzKj60RXZvQN1I+Tv0BBC gV6/T+5e3o6NjwzEpCmztawKGYTFZXnCniltYzpJppjRUTbp+5vKO/mnLum0JlXv2ENP zFdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678299305; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NEdEeZELmlW5pu4Rqj6AM4mq5SphObaBkCPduzxuLXg=; b=U9APP1mlrNXyV9TrZCaO60VyoD52a+V3pSDZblcueSrlWLvp/jR6t8XOEL1o/g4Uge Ha1kd69ov9O1H79EOj0erhIUE8UcirD7JDYr70RUlNmaC5ybhIWnTrwnUCIzhEvBEafG VJkDZ0ErvqfX5bt479kJ/R6SF413h+gt7iKk9cNvlcwMOKQn4q4o8ve/y+Nqrtax+2pp kyTyjIXOzPXzDN6RAPttDkeYjd/5TFtl19aqtgjGl/giKyoFnMW0Iconmlq5xubHj5D+ 9OsEJfKWWFJzQ9620vgIRr0BuRTTWUCvOFli0V7zsiuqfK+DZmEeWgPa39RHeQAGcx31 m+Rg== X-Gm-Message-State: AO0yUKXL38FFnvPmO4Z72tGd5hS/0MRZEeSce/Tjv7iVLYNtrGUmeTgi tjYwoZpqFHmZhkbG9/uqcEE= X-Google-Smtp-Source: AK7set+k0oUuWKk5DwHsWNyodosBURrKQa9eZmkZfBM3fn4tt+583qz1dfFcssYrXDnCQfqme83tWA== X-Received: by 2002:a17:906:5e0c:b0:872:82d3:4162 with SMTP id n12-20020a1709065e0c00b0087282d34162mr17413568eju.44.1678299304856; Wed, 08 Mar 2023 10:15:04 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id o6-20020a17090611c600b008b17eb06282sm7790956eja.213.2023.03.08.10.15.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Mar 2023 10:15:04 -0800 (PST) Content-Language: en-US In-Reply-To: <69793abf-3d2f-2dbe-698b-877ededfc56b@yandex.ru> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:257557 Archived-At: On 08/03/2023 19:57, Dmitry Gutov wrote: > After some edebug-ing, the patch below seems to fix this case Small correction for cases outside of any blocks: diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1f970633bfc..81475f31f60 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -5792,7 +5792,9 @@ python-info-dedenter-opening-block-positions (catch 'exit (while (python-nav--syntactically (lambda () - (re-search-backward (python-rx block-start) nil t)) + (cl-loop for pt = (re-search-backward (python-rx block-start) nil t) + until (memq (char-before) '(nil ?\s ?\t ?\n)) + finally return pt)) #'<) (let ((indentation (current-indentation))) (when (and (not (memq indentation collected-indentations))