From unknown Fri Jun 20 05:32:26 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#56635 <56635@debbugs.gnu.org> To: bug#56635 <56635@debbugs.gnu.org> Subject: Status: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks Reply-To: bug#56635 <56635@debbugs.gnu.org> Date: Fri, 20 Jun 2025 12:32:26 +0000 retitle 56635 29.0.50; [PATCH] hide-show in python-mode supports ONLY funct= ion and class blocks reassign 56635 emacs submitter 56635 Dima Kogan severity 56635 normal tag 56635 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 18 18:20:45 2022 Received: (at submit) by debbugs.gnu.org; 18 Jul 2022 22:20:45 +0000 Received: from localhost ([127.0.0.1]:52393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oDZ6a-00076J-RF for submit@debbugs.gnu.org; Mon, 18 Jul 2022 18:20:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:34372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oDZ6Y-00076A-6t for submit@debbugs.gnu.org; Mon, 18 Jul 2022 18:20:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDZ6X-0000ik-R2 for bug-gnu-emacs@gnu.org; Mon, 18 Jul 2022 18:20:42 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:60497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDZ6U-0007jo-Pt for bug-gnu-emacs@gnu.org; Mon, 18 Jul 2022 18:20:41 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id BE40A32007D7 for ; Mon, 18 Jul 2022 18:20:35 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 18 Jul 2022 18:20:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secretsauce.net; h=cc:content-type:date:date:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to; s=fm2; t= 1658182834; x=1658269234; bh=AHP82qI2EpLLjSzvIdvMLawEJNAt3ECV0NH P4o16ycw=; b=POU8pk349naQTUZ/WH5APxyZWUXC+WWLOvktzinZRZ+tTIPF2Xa FpHV6GS6/BMleMZ84FAfBLpxW0cli/pOvH9F3h4Pd2jiyELdfCJXDCMrXWUD83MZ pnk1krtB4fK0EUtxIYi5irUHDC/nb2j1INsluDNYnFr38D6V7hfA3ykV5nMvKfZw lQ3jbuyhMgzallp8vl4HZX44W5cKu/LQ353q/IA45ijaDxaV9DaWPTFHKX4MoUQT 33ccBc+o0w4op6eVy6HynXpx1iT3nJEh/q93YWIbYUOnzsvF1Q9HRhBCzo3zCUXL wXg0m0BL2bI8nxJQKWoxWiVDMqBlgIFmlxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:message-id:mime-version :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1658182834; x= 1658269234; bh=AHP82qI2EpLLjSzvIdvMLawEJNAt3ECV0NHP4o16ycw=; b=t 5oJ1wIq9gUkFXr43VY/MI5TeYxFmh4aFyR7ehJmlITj9dEHCgmewnIYZi1TEafEQ 4heRFVm2ONPxxrgIO0UXVcJE90KlunobX1WNjInBqm9fphBkxVPNf0jtDNr//yKR lg0mpguGBwfp3TLZlgQk9mcBVj6VBNHn+/iefuQZ4XhHz/zkozXlI6v8cepfE7IO UYA6w8l42QZyR00qo2qc9/3QD1DEc2g2KLNCIMZEzJmqs+vBapEZbNIVjf0qijKP CU5LpdvBx35CEKAqodj6u4aXjZo62O/Z93lgpoH2nNXqzOc2oAQ/gI+OcO7F6Hwg hZORSF0XQwO20HrgTxmfQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudekledgtdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkgggtsehttdertddttd dtnecuhfhrohhmpeffihhmrgcumfhoghgrnhcuoeguihhmrgesshgvtghrvghtshgruhgt vgdrnhgvtheqnecuggftrfgrthhtvghrnhepffdvffduhfekfffhieefhfffvddtgfefje evuedvfedujeejudevfedtgeeguedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepughimhgrsehsvggtrhgvthhsrghutggvrdhnvght X-ME-Proxy: Feedback-ID: i3e8042a0:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 18 Jul 2022 18:20:34 -0400 (EDT) From: Dima Kogan To: bug-gnu-emacs@gnu.org Subject: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks Date: Mon, 18 Jul 2022 15:20:30 -0700 Message-ID: <87v8ruysep.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=64.147.123.25; envelope-from=dima@secretsauce.net; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) Hi. I'm using hide-show mode to visually collapse blocks while coding. This is very helpful, and works great in C-like modes. hide-show mode currently supports Python in a limited fashion: only def: and class: blocks are hidden. Other kinds of blocks (if, else, for, while, ...) are not supported. A simple patch that mostly adds support for all other kinds of blocks is: diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1c99937c4b9..b63d2bc0690 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -4819,7 +4819,7 @@ python-describe-at-point (defun python-hideshow-forward-sexp-function (_arg) "Python specific `forward-sexp' function for `hs-minor-mode'. Argument ARG is ignored." - (python-nav-end-of-defun) + (python-nav-end-of-block) (unless (python-info-current-line-empty-p) (backward-char))) @@ -5766,8 +5766,8 @@ python-mode (add-to-list 'hs-special-modes-alist - '(python-mode - "\\s-*\\_<\\(?:def\\|class\\)\\_>" + `(python-mode + ,(python-rx block-start) ;; Use the empty string as end regexp so it doesn't default to ;; "\\s)". This way parens at end of defun are properly hidden. "" I say "mostly" because this isn't doable with regular expressions, as is required by hide-show mode. So this patch can confuse the parser: some bits of code will look like they begin a block, while in reality they do not. hide-show would then collapse lines that it should ignore. Some Python code that shows this failure: if 0: aaa l = [ i for i in range(5) \ if i < 3 ] ccc abc = o.match(1,2,3) ddd Here the "for" and "if" in the list comprehension both trigger the block hiding. And the "match" function call triggers it too. python-mode has functions to move between blocks (python-nav-...), but they're not completely regex-based, so they can't be baked into hide-show. Suggestions? Obvious options: 1. Leave the code as it is, don't support other blocks 2. Take this patch, with the understanding that it'll collapse some stuff that it shouldn't 3. Patch hide-show to potentially accept non-regex logic I've been dogfooding the patch for a few days now, and it's behaving 99% properly for me, so I'm inclined to suggest option 2. Making hide-show smarter (option 3) doesn't feel worth the effort to fix THIS problem. Thanks! From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 23 03:59:10 2022 Received: (at 56635) by debbugs.gnu.org; 23 Jul 2022 07:59:10 +0000 Received: from localhost ([127.0.0.1]:43205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFA2X-00026l-Op for submit@debbugs.gnu.org; Sat, 23 Jul 2022 03:59:09 -0400 Received: from quimby.gnus.org ([95.216.78.240]:48164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFA2V-00026T-NU for 56635@debbugs.gnu.org; Sat, 23 Jul 2022 03:59:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=63s4/YoLG9L3kmUKhev8P+EVZvICxIeIlTbemzN74Y0=; b=Z37wSoM3QmcnkMrX5oDSdwK0it UMbxoD5VNAkOYKdtAI3LjKlH9A9OzDRZThchWf6ZQU8JnMcl4ohynkVk6weLMuKfEB0luLkPlgpRg oS7vquldBnoswS+cR5R/YXBeaQe8/jC7hPYQSXLiwWqgY4MzfKp24lpLoTC4Gs4rh3nM=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oFA2M-000053-Ff; Sat, 23 Jul 2022 09:59:00 +0200 From: Lars Ingebrigtsen To: Dima Kogan Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks In-Reply-To: <87v8ruysep.fsf@secretsauce.net> (Dima Kogan's message of "Mon, 18 Jul 2022 15:20:30 -0700") References: <87v8ruysep.fsf@secretsauce.net> X-Now-Playing: The Residents's _Subterranean Modern_: "Time's Up" Date: Sat, 23 Jul 2022 09:58:57 +0200 Message-ID: <87zgh01cqm.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dima Kogan writes: > Obvious options: > > 1. Leave the code as it is, don't support other blocks > > 2. Take this patch, with the understanding that it'll collapse some > stuff that it shouldn't > > 3. Patch hide-show t [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56635 Cc: kobarity , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Dima Kogan writes: > Obvious options: > > 1. Leave the code as it is, don't support other blocks > > 2. Take this patch, with the understanding that it'll collapse some > stuff that it shouldn't > > 3. Patch hide-show to potentially accept non-regex logic > > I've been dogfooding the patch for a few days now, and it's behaving 99% > properly for me, so I'm inclined to suggest option 2. Making hide-show > smarter (option 3) doesn't feel worth the effort to fix THIS problem. Hm; don't know either. Kobarity's done some work in related areas in python-mode lately, and perhaps has some comments, so added to the CCs. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 23 11:51:42 2022 Received: (at 56635) by debbugs.gnu.org; 23 Jul 2022 15:51:42 +0000 Received: from localhost ([127.0.0.1]:46102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFHPp-0000DN-Ug for submit@debbugs.gnu.org; Sat, 23 Jul 2022 11:51:42 -0400 Received: from mail-ej1-f45.google.com ([209.85.218.45]:41497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFHPn-0000D5-7a for 56635@debbugs.gnu.org; Sat, 23 Jul 2022 11:51:39 -0400 Received: by mail-ej1-f45.google.com with SMTP id z23so13231710eju.8 for <56635@debbugs.gnu.org>; Sat, 23 Jul 2022 08:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=N25J6wFagsWGYd+8Pd+uch98aDPXeD5xxtR8a2FhyqU=; b=GndqLviNsKoucGAL7vLIo8MmsyOWRYrydII/hvIRhgylpdNIdGjRWNNWpfI9hH7i+f xLxPT6eYkhFQybzFDqCWTPJpD0SByZ9EAs9A/vkdpD2akLXwsPD+JJMjJDgKp+Fmwbm6 bn0RPQEwWTXWd6zXf+RjPpdQkOkAp9Y50F6zrvkzUvuDNY15f74Igy5Ge+na949+mOn8 oPNAry7nEURmXfr+6f/gE0L9omzhAfvTpfIDPiNvIgvLu2TELhOH103DwI/YCBj3lW8d 0EyJe+XnkBjYddMKmPYs95Xixgl+XhZfc7LAvoGSQCHH89Vj/4A2PV5klSjbzSTHxctR lmBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=N25J6wFagsWGYd+8Pd+uch98aDPXeD5xxtR8a2FhyqU=; b=LQGNdx6PynfxZHmlAI8Oq0aLcgabDHiCKd3OkOaphoTxUXWZojiVNeUB86hw96A6+b QsSWTLbMmhluXQOSHLbzrDXv6xUk68kMqhP/9YE2OVGZxJk0BMyEqVAeZR0n/DWIHkBC u7PsOWQMM1GD9CiiukaiEgYDt9Y5aKijcOxJrtm/cpNHNNBa2BioOg/+u5NUzRurLZ+d UfT8aBuyPYUEBAO1/XwkrZSNYa5xS+mb4tR/cnv9WPtduX0/5md0vpYdYX708nKMkWcv DLJ2eu20d/SZqe7MQ5yPsE1bntNWTcLlUXoDdTQDE072J7dgycGDNKkMSfyiKoxZ+XWx 2Rlg== X-Gm-Message-State: AJIora+7kqE3WcBb6QRdAl1k+51EdRoiGJiyfHqd1GovknwUDud0nRW7 aePkzBxcOC6T533D/FyjY/CPqFonuvCjVcNliuM= X-Google-Smtp-Source: AGRyM1sHk2WnOx8fbvWMZL9CsJKPnerDidpLIy6MUM2BBRKF5QHReu0zA3NqPCCVvcNfpOU2qv+52hdFQcOzWK8h/1A= X-Received: by 2002:a17:907:7637:b0:72b:3a3b:7d68 with SMTP id jy23-20020a170907763700b0072b3a3b7d68mr3709344ejc.566.1658591493189; Sat, 23 Jul 2022 08:51:33 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> In-Reply-To: <87zgh01cqm.fsf@gnus.org> From: kobarity Date: Sun, 24 Jul 2022 00:51:21 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Lars Ingebrigtsen Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Lars Ingebrigtsen wrote: > Hm; don't know either. Kobarity's done some work in related areas in > python-mode lately, and perhaps has some comments, so added to the CCs. Thank you for letting me know about this issue. It would be nice if Python hideshow works for blocks. May I have some time to think about it? Regards, From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 23 16:46:05 2022 Received: (at 56635) by debbugs.gnu.org; 23 Jul 2022 20:46:05 +0000 Received: from localhost ([127.0.0.1]:46396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFM0i-0002g1-RG for submit@debbugs.gnu.org; Sat, 23 Jul 2022 16:46:05 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:44985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFM0f-0002fM-So for 56635@debbugs.gnu.org; Sat, 23 Jul 2022 16:46:03 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id AE7C63200583; Sat, 23 Jul 2022 16:45:55 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 23 Jul 2022 16:45:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secretsauce.net; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1658609155; x=1658695555; bh=Qj xqZasE3hoA7qOkdHJWpI1ryB+E4h7cx2GG235qd9g=; b=1SQLPiDaG0etYezrqO ieqe33xpX72jk8bNlLeWlgOOYxTaju0IjA9D48qojxCCX8ZOFYEPviZO4S7adZXk SAbc236ckWRi/9zWKxRVLkJbFXY9dRyYuwY9vqcxOIhs2fqIQZU2iBpAjztzmdjS viGXreBvgTXnvzYBpw6InC3WcZ5yjX6Vdb4Y60/yHpSLdv2x8kAsKFIcyxwRmM9G am/PFNNG/31Me7MHg6rE2ldG2TWxBOxV1ytXLNohyb8jaiv65s+Ga4SXnE1g7TiS nR9ilhfo/0sIDoOKVZuAcSLpdZrFCn4FMI9JdstKx6odTgnt0C9HwrlAGW+PuaEQ xStw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1658609155; x=1658695555; bh=QjxqZasE3hoA7qOkdHJWpI1ryB+E 4h7cx2GG235qd9g=; b=oqcs/LKJTDiUHWw1vNUwVSAnbRzG7YXMM6O8/Nu4z86o eeHQ/mG0HH8H0/TonCAkKOd+5u2HFVmTij2WlKvYHQdrKogi0aqNrloJXpYyT96o GiR9grzTM2Fh5sGGqmapZx4hHHvKWEDFL0TW10MFUyja8v75a5qMUs0ufdR6hkBm dIUGI9SqFDtah+nYwF85W9niHAigiFqxetw/4gqmMIzg8Kfw0HOC8V4fJJ0EVY0Q nXUycFKQ5bQfhXAKVwD5NtpEFlbfXWQCa6Yd6ZSLS61yAlBfTh9qdmfmoR6jNeTS lZAUbXuSjqMKq8mJNmbGL+Gm21zbBY8dzXKmI/W7aA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddtgedgudehjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpehffgfhvfevufffjgfkgggtsehttdertddtredtnecuhfhrohhmpeffihhm rgcumfhoghgrnhcuoeguihhmrgesshgvtghrvghtshgruhgtvgdrnhgvtheqnecuggftrf grthhtvghrnhepgfeifeehgedvkeekvdevvdelvdegleevtedvueejvdejveduveeuleev leevudetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epughimhgrsehsvggtrhgvthhsrghutggvrdhnvght X-ME-Proxy: Feedback-ID: i3e8042a0:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 23 Jul 2022 16:45:54 -0400 (EDT) References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> User-agent: mu4e 1.6.10; emacs 29.0.50 From: Dima Kogan To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks Date: Sat, 23 Jul 2022 13:41:27 -0700 In-reply-to: Message-ID: <87sfmr5zi9.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Thanks for taking the time to look at this. After a big more dogfooding, I've a small tweak to the first piece of the patch: diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1c99937c4b9..2b2b0900bee 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -4819,9 +4819,7 @@ python-describe-at-point (defun python-hideshow-forward-sexp-function (_arg) "Python specific `forward-sexp' function for `hs-minor-mode'. Argument ARG is ignored." - (python-nav-end-of-defun) - (unless (python-info-current-line-empty-p) - (backward-char))) + (python-nav-end-of-block)) ;;; Imenu So (python-hideshow-forward-sexp-function) should call (python-nav-end-of-block) and do nothing else. I think the extra (backward-char) stuff was intended to handle the closing brace of the block, which doesn't exist in Python. If you leave the (backward-char) stuff there, the collapsed blocks still display the last character in the block, which in Python has no special syntactical meaning. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 23 20:57:33 2022 Received: (at 56635) by debbugs.gnu.org; 24 Jul 2022 00:57:33 +0000 Received: from localhost ([127.0.0.1]:46576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFPw5-0001gf-Ah for submit@debbugs.gnu.org; Sat, 23 Jul 2022 20:57:33 -0400 Received: from mail-ej1-f48.google.com ([209.85.218.48]:41681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFPw3-0001gS-I3 for 56635@debbugs.gnu.org; Sat, 23 Jul 2022 20:57:32 -0400 Received: by mail-ej1-f48.google.com with SMTP id z23so14497291eju.8 for <56635@debbugs.gnu.org>; Sat, 23 Jul 2022 17:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=shkeANi5OorlfBaNrDIgNeECy6l1iuY5dbF6rQwQK/s=; b=obPAsWRsLYKJg3XkJknuvkYSRMDE4J9kYWFPmdJQIw4TJUuLTwq3c8u2ckgSQTSVGi mtHjwMx7L95BzoDczYKX+y71Og81gfZME/jZwVv/4eROj7iQ7yqdhlE7h5r/JiNFX0ta BVKz1nlyEU1bIvmk0UwmUgEzWRVOPMwRWvVQnSDeXHjlxOG7n3SXuP4FROZzonghhITY 6VCiMAWRlHGlik9gZcP+6HhQEXASuN9qCPlDyxvRoDJGChkcNZd1dPrX8RXovV2gyUKW 8h27XJ8m3FjhbeLjxbWo12IUzgHZuMynUtfNTDwKHltTRxrtEE0eIiKmZ3kmsZ2FuhwV cA9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=shkeANi5OorlfBaNrDIgNeECy6l1iuY5dbF6rQwQK/s=; b=5g2RONhAzVrt0LZ0U39SFoUSHzQ12oqumcu7UFvxGhi1e6RZwjOoPmx6mCZzK/7AUE zzXpL7JK1N3RBzt3bMq2yzgB9Xn4BktOw/GtLLjvknsRcv/0KFZYu5F0oqHPnYr/Wr4/ /4QfsPZwUK/GvLhp1XTZnCBaxW04J0tYWSmf6lEFJSPEZREjUUpT9SRkBYO8x76zcMl/ AH3jxqZvP3kSxDTUYmGNPK92hu+rpbLd/PQjQhsmPJxmijMyb5hPGt6UhUykYFEVtfmv /p9eiyqNMmKWcTSwLkKe6Hk83GSxD70LbliSTbBJXbrp7vWfycKJ/snDZh/9Lt1qsMrk +KWg== X-Gm-Message-State: AJIora+UT2S+g/wupTUuOkS1hoCdw7zHKv2zeRz+QJ7k3VnHxlGyRN8h +R6Hc/f5Ahaxec4r8xEKMUYB/n+exDeg6oW5pxo= X-Google-Smtp-Source: AGRyM1sFa3QOq9Du8K2hPthaEn5k0m6HU9SjbaKolDvM9GSUwR5j3C+l0o38O75G7OA9NFEwfRFGLdN7Ebk1X4GEVYI= X-Received: by 2002:a17:906:6a2a:b0:72c:e324:9844 with SMTP id qw42-20020a1709066a2a00b0072ce3249844mr4767576ejc.303.1658624245586; Sat, 23 Jul 2022 17:57:25 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> In-Reply-To: <87sfmr5zi9.fsf@secretsauce.net> From: kobarity Date: Sun, 24 Jul 2022 09:57:13 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Dima Kogan Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Dima, Dima Kogan wrote: > So (python-hideshow-forward-sexp-function) should call > (python-nav-end-of-block) and do nothing else. I think the extra > (backward-char) stuff was intended to handle the closing brace of the > block, which doesn't exist in Python. If you leave the (backward-char) > stuff there, the collapsed blocks still display the last character in > the block, which in Python has no special syntactical meaning. This is one point I was thinking of. The first patch failed to pass ERTs python-hideshow-hide-levels-1 and python-hideshow-hide-levels-2. The second patch still fails with python-hideshow-hide-levels-1, but I think it's OK to fix the ERT: diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el index 3b10bde23b..8cb2aa84d0 100644 --- a/test/lisp/progmodes/python-tests.el +++ b/test/lisp/progmodes/python-tests.el @@ -5828,8 +5828,11 @@ python-hideshow-hide-levels-1 class SomeClass: def __init__(self, arg, kwarg=1): + def filter(self, nums): - def __str__(self):")))) + + def __str__(self): +")))) (or enabled (hs-minor-mode -1))))) (ert-deftest python-hideshow-hide-levels-2 () It would be better to add some ERTs for blocks. Another point I am thinking of is to improve the regex. As hs-special-modes-alist has a support of the form (COMPLEX-START MDATA-SELECTOR), I tried with the code below: (add-to-list 'hs-special-modes-alist `(python-mode (,(python-rx (seq (or (seq buffer-start (? ?\n)) (seq (not ?\\) ?\n)) (* space) (group block-start))) 1) ;; Use the empty string as end regexp so it doesn't default to ;; "\\s)". This way parens at end of defun are properly hidden. "" "#" python-hideshow-forward-sexp-function nil)) This code solves many problems of `hs-hide-block' mentioned in the first mail, but it breaks `hs-hide-level'. It seems that current MDATA-SELECTOR support is limited and needs some fixes if we want to do something like above. I will look into this a little bit more. Regards, From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 31 06:18:48 2022 Received: (at 56635) by debbugs.gnu.org; 31 Jul 2022 10:18:48 +0000 Received: from localhost ([127.0.0.1]:36441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oI623-0000gJ-MZ for submit@debbugs.gnu.org; Sun, 31 Jul 2022 06:18:47 -0400 Received: from mail-ed1-f53.google.com ([209.85.208.53]:36411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oI621-0000g2-Ou for 56635@debbugs.gnu.org; Sun, 31 Jul 2022 06:18:46 -0400 Received: by mail-ed1-f53.google.com with SMTP id c12so10436530ede.3 for <56635@debbugs.gnu.org>; Sun, 31 Jul 2022 03:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=j3BWb6uj4GW7cIrGhhKcuUheMd4mDCfpIN3+w8abEDU=; b=W/dteJySud5Xm9NzCQ1hK7twZeYfDTw3u8lkTy+boQIWQc7kaucXY1EDgE6JWE+xWk +6mZIbdeJQno3M8aAUKLWuCQ3cC4e7fEVNdb/yc3jkstSr4IdAwik5YemUTz8hHFfJdW lrWgPYw3nUz5n7GZWRIAHRCAl4/JrqRINGVR6eqL/f8DuoYjeABNKHqFjLV3i4cWATNE baIzbrInWvNdBroPzEmv+6qfZNpfMcK6VOG0Nwm8QkdTpaDKJq1yJIL9vTRztA05RXbC Ljnbr3NsPPxQp+Qyzr0gJck4wJAfQEcQPkG6EykxdHDn4ePV+kplQ0ukfTJam6uXjpbl G3Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=j3BWb6uj4GW7cIrGhhKcuUheMd4mDCfpIN3+w8abEDU=; b=eg95mkmudZMqiKMfV+ItT+tYJd3tnSbeZw9nhAhptrC3lv6kX18+O800GPFXYGeLD0 yZbrC9GBWlniOVaZrQA4m1PYqvb0tSIipJGhFmtxo8NQhFmO9e4pMP0S8AwfQeZfrOLt ssEv2eIbgY/0QzFhPVGfRThEo2EDKS+FtHpWFl3cZhHLK82ESyXVgNWGJ2u1evgcR/pP 0SVDk+MVqWbsOSfxhFvI+Kv+49KLHGQ5MFxYau6jt3nIQsKQagEo4fsbMbO8bPAjIAbA 01woe7qTgM0P7OkcpLl6me1Prvi2y4FTt8QWWXehFSpNj6GgN4qRyqyvj2jOrEncRkWi ycSQ== X-Gm-Message-State: AJIora9513sI8uvsOWGWUoqB5z4UToYzANtFb3rshhQHN0XYWS8lLjNY Bg031MPJTwAgfHMUMzaSJovdFcY3JSPwPoT9PiM= X-Google-Smtp-Source: AGRyM1u9wWnizVbhRF0muYONirzFhudf6mPY5yLsBbIDe9SWfBkWYGz2sW+hUGOJylqL1YmpR14aNU2ntNkcPua+msY= X-Received: by 2002:aa7:da93:0:b0:43d:1d9d:1e5 with SMTP id q19-20020aa7da93000000b0043d1d9d01e5mr10471997eds.55.1659262719871; Sun, 31 Jul 2022 03:18:39 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> In-Reply-To: From: kobarity Date: Sun, 31 Jul 2022 19:18:26 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Dima Kogan Content-Type: multipart/mixed; boundary="00000000000002393b05e51735de" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --00000000000002393b05e51735de Content-Type: text/plain; charset="UTF-8" I wrote: > This code solves many problems of `hs-hide-block' mentioned in the > first mail, but it breaks `hs-hide-level'. It seems that current > MDATA-SELECTOR support is limited and needs some fixes if we want to > do something like above. I will look into this a little bit more. There are some problems in this approach. The biggest one is the way of processing in `hs-hide-level-recursive'. It basically repeats: 1. hs-hide-block-at-point 2. forward-comment 3. re-search-forward hs-block-start-regexp Let me explain with the following code: #+begin_src python class C: def a(): pass def b(): pass #+end_src Let's assume that point is at the beginning of the line "def a():". The first step hides the method "a" and moves the point to the end of the block. The second step moves the point to the position "d" of "def b():", not the beginning of the line. Therefore, if hs-block-start-regexp contains rx line-start, it fails to match "def b():". Although this can be solved by adding a flag or a mode specific forward-comment function to hs-special-modes-alist, I'm not sure if it is the right approach. So I think the following setting is best at this moment. #+begin_src elisp (add-to-list 'hs-special-modes-alist `(python-mode ,(python-rx (seq (* (syntax ?-)) block-start)) ;; Use the empty string as end regexp so it doesn't default to ;; "\\s)". This way parens at end of defun are properly hidden. "" "#" python-hideshow-forward-sexp-function nil)) #+end_src (* (syntax ?-)) corresponds to "\\s-*" of the current regexp. It allows the point to be located before the block start symbols. Another idea to improve the behavior of hiding a block is to provide a wrapper function of `hs-hide-block' as follows and remap the key bindings to this function like `python-mark-defun'. With this approach, C-c @ C-d and C-c @ C-h work as expected with the example shown in the first mail. #+begin_src elisp (defun python-hideshow-hide-block (&optional end) "Python specific `hs-hide-block' function for `hs-minor-mode'. Argument END is passed to `hs-hide-block'." (interactive "P") (python-nav-beginning-of-block) (hs-hide-block end)) #+end_src Attached is a PoC level patch of this approach. What do you think of this approach? Regards, --00000000000002393b05e51735de Content-Type: application/octet-stream; name="56635-poc.patch" Content-Disposition: attachment; filename="56635-poc.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6962plz0 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBiL2xpc3AvcHJvZ21vZGVzL3B5 dGhvbi5lbAppbmRleCBiOGZjN2Q0YzU0Li5jYThiZmY5YTZlIDEwMDY0NAotLS0gYS9saXNwL3By b2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsCkBAIC0zMDMs NiArMzAzLDggQEAgcHl0aG9uLW1vZGUtbWFwCiAgICAgKGRlZmluZS1rZXkgbWFwICJcQy1jXEMt diIgIydweXRob24tY2hlY2spCiAgICAgKGRlZmluZS1rZXkgbWFwICJcQy1jXEMtZiIgIydweXRo b24tZWxkb2MtYXQtcG9pbnQpCiAgICAgKGRlZmluZS1rZXkgbWFwICJcQy1jXEMtZCIgIydweXRo b24tZGVzY3JpYmUtYXQtcG9pbnQpCisgICAgOzsgSGlkZXNob3cKKyAgICAoZGVmaW5lLWtleSBt YXAgW3JlbWFwIGhzLWhpZGUtYmxvY2tdICMncHl0aG9uLWhpZGVzaG93LWhpZGUtYmxvY2spCiAg ICAgOzsgVXRpbGl0aWVzCiAgICAgKHN1YnN0aXR1dGUta2V5LWRlZmluaXRpb24gIydjb21wbGV0 ZS1zeW1ib2wgIydjb21wbGV0aW9uLWF0LXBvaW50CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbWFwIGdsb2JhbC1tYXApCkBAIC00ODI1LDkgKzQ4MjcsMTYgQEAgcHl0aG9uLWRlc2Ny aWJlLWF0LXBvaW50CiAoZGVmdW4gcHl0aG9uLWhpZGVzaG93LWZvcndhcmQtc2V4cC1mdW5jdGlv biAoX2FyZykKICAgIlB5dGhvbiBzcGVjaWZpYyBgZm9yd2FyZC1zZXhwJyBmdW5jdGlvbiBmb3Ig YGhzLW1pbm9yLW1vZGUnLgogQXJndW1lbnQgQVJHIGlzIGlnbm9yZWQuIgotICAocHl0aG9uLW5h di1lbmQtb2YtZGVmdW4pCi0gICh1bmxlc3MgKHB5dGhvbi1pbmZvLWN1cnJlbnQtbGluZS1lbXB0 eS1wKQotICAgIChiYWNrd2FyZC1jaGFyKSkpCisgIChweXRob24tbmF2LWVuZC1vZi1ibG9jaykp CisKKyhkZWNsYXJlLWZ1bmN0aW9uIGhzLWhpZGUtYmxvY2sgImhpZGVzaG93IikKKworKGRlZnVu IHB5dGhvbi1oaWRlc2hvdy1oaWRlLWJsb2NrICgmb3B0aW9uYWwgZW5kKQorICAiUHl0aG9uIHNw ZWNpZmljIGBocy1oaWRlLWJsb2NrJyBmdW5jdGlvbiBmb3IgYGhzLW1pbm9yLW1vZGUnLgorQXJn dW1lbnQgRU5EIGlzIHBhc3NlZCB0byBgaHMtaGlkZS1ibG9jaycuIgorICAoaW50ZXJhY3RpdmUg IlAiKQorICAocHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2spCisgIChocy1oaWRlLWJsb2Nr IGVuZCkpCiAKIAwKIDs7OyBJbWVudQpAQCAtNTc3Myw4ICs1NzgyLDggQEAgcHl0aG9uLW1vZGUK IAogICAoYWRkLXRvLWxpc3QKICAgICdocy1zcGVjaWFsLW1vZGVzLWFsaXN0Ci0gICAnKHB5dGhv bi1tb2RlCi0gICAgICJcXHMtKlxcXzxcXCg/OmRlZlxcfGNsYXNzXFwpXFxfPiIKKyAgIGAocHl0 aG9uLW1vZGUKKyAgICAgLChweXRob24tcnggKHNlcSAoKiAoc3ludGF4ID8tKSkgYmxvY2stc3Rh cnQpKQogICAgICA7OyBVc2UgdGhlIGVtcHR5IHN0cmluZyBhcyBlbmQgcmVnZXhwIHNvIGl0IGRv ZXNuJ3QgZGVmYXVsdCB0bwogICAgICA7OyAiXFxzKSIuICBUaGlzIHdheSBwYXJlbnMgYXQgZW5k IG9mIGRlZnVuIGFyZSBwcm9wZXJseSBoaWRkZW4uCiAgICAgICIiCmRpZmYgLS1naXQgYS90ZXN0 L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0 aG9uLXRlc3RzLmVsCmluZGV4IDZmMmFkODdmODEuLmJjNTZhYmFhMmEgMTAwNjQ0Ci0tLSBhL3Rl c3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9wcm9nbW9k ZXMvcHl0aG9uLXRlc3RzLmVsCkBAIC01ODU3LDggKzU4NTcsMTEgQEAgcHl0aG9uLWhpZGVzaG93 LWhpZGUtbGV2ZWxzLTEKIGNsYXNzIFNvbWVDbGFzczoKIAogICAgIGRlZiBfX2luaXRfXyhzZWxm LCBhcmcsIGt3YXJnPTEpOgorCiAgICAgZGVmIGZpbHRlcihzZWxmLCBudW1zKToKLSAgICBkZWYg X19zdHJfXyhzZWxmKToiKSkpKQorCisgICAgZGVmIF9fc3RyX18oc2VsZik6CisiKSkpKQogICAg ICAgKG9yIGVuYWJsZWQgKGhzLW1pbm9yLW1vZGUgLTEpKSkpKQogCiAoZXJ0LWRlZnRlc3QgcHl0 aG9uLWhpZGVzaG93LWhpZGUtbGV2ZWxzLTIgKCkK --00000000000002393b05e51735de-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 31 15:54:48 2022 Received: (at 56635) by debbugs.gnu.org; 31 Jul 2022 19:54:48 +0000 Received: from localhost ([127.0.0.1]:38644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIF1T-0003Zk-St for submit@debbugs.gnu.org; Sun, 31 Jul 2022 15:54:48 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:52665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oIF1R-0003ZT-GO for 56635@debbugs.gnu.org; Sun, 31 Jul 2022 15:54:46 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 5488F5C00B4; Sun, 31 Jul 2022 15:54:39 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 31 Jul 2022 15:54:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secretsauce.net; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1659297279; x=1659383679; bh=fs epG65gmEqEKFOCL1SUSSvpZdT5Yyg1yVuqg0XeXn0=; b=fJ2HUL75kBA+pzmlKx fsw/HLWolzi+XkylO+Ol/1SV4huXvMjBbH87p1SbVL7X8mhOEndzmGiTm34gKI3Q 6wCP5qcD4xFe7RZJztUx+FV09O6piAE2UfnRC+wgWcxY5R6HanUqES8crmLkWEFM 04hl5lCuku1kOSvrZsr1jxSw6A1b1qFHp2KXrUp159lWHOiKzMVNEOgsox4hpjTG jWE97dk29DBZEAX/rKgqOVtTonVrGDeMtHzQYZD74bVNkxlHYUkHbIXk0oSNKwG/ Sti/TpxRo8Qp1JOJVYc8J2Lg8MChxsFd1QduonR2DydD1S0/SfmSReaEO4oLjVOF wYHQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1659297279; x=1659383679; bh=fsepG65gmEqEKFOCL1SUSSvpZdT5 Yyg1yVuqg0XeXn0=; b=EoKtWYlSkz8LPiZ9Dnj3VSflIkQy40nKrrpskUEdLu8S ZdcGBtqkO9S8usX4OBN08IRATduEwp9I/QCvi5nyMMdDwMJeKaj/sMX8priSMTed BJxWqpfrwsRMLL3WbU5PjyivFo5NhVPvXDrQD0mmq5d8QvfUj+BzrRjfjxszakQ2 PjcrvxZBGToq2Kizoinlyz543j/deNEMnkBtrNNGLWo1yN4/WEuuMLvBRPpUk9Tn hyRyxBzXiAxcAGJizYFfdhnozUQjmIx5OrtTs65tg6eDXpX6DxGto3qQpkAvCAUJ n4+v5s5q/IJQ7bZ6h1Q9+Z4fg7fZYkI/DhKW3ymeNg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvuddgudegjecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpehffgfhvfevufffjgfkgggtsehttdertddtredtnecuhfhrohhmpeffihhm rgcumfhoghgrnhcuoeguihhmrgesshgvtghrvghtshgruhgtvgdrnhgvtheqnecuggftrf grthhtvghrnhepgfeifeehgedvkeekvdevvdelvdegleevtedvueejvdejveduveeuleev leevudetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epughimhgrsehsvggtrhgvthhsrghutggvrdhnvght X-ME-Proxy: Feedback-ID: i3e8042a0:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 15:54:38 -0400 (EDT) References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> User-agent: mu4e 1.8.6; emacs 29.0.50 From: Dima Kogan To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks Date: Sun, 31 Jul 2022 12:04:48 -0700 In-reply-to: Message-ID: <87wnbt3vnq.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi. Thanks for looking at this. I do agree that the best thing to do is to use functions instead of pure regexes here. Can we hook that into hs-special-modes-alist instead of doing something specific in python-mode? I'm imagining extending the meaning of the fields in hs-special-modes-alist, where we'd do something different, depending on if some element is a string or not. Maybe that would make it easier to extend the hideshow support for other languages? From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 07 10:38:20 2022 Received: (at 56635) by debbugs.gnu.org; 7 Aug 2022 14:38:20 +0000 Received: from localhost ([127.0.0.1]:38064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKhQ4-00068b-23 for submit@debbugs.gnu.org; Sun, 07 Aug 2022 10:38:20 -0400 Received: from mail-ej1-f49.google.com ([209.85.218.49]:39480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKhQ2-00068O-3E for 56635@debbugs.gnu.org; Sun, 07 Aug 2022 10:38:18 -0400 Received: by mail-ej1-f49.google.com with SMTP id i14so12423055ejg.6 for <56635@debbugs.gnu.org>; Sun, 07 Aug 2022 07:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=xAQXPiGqEvnwv7HCRdE1uet5LEyywV4k9x/p7B3wxS4=; b=SiovDxeUfzsyLSl8V+gpivAmOj73iOPx1jRNqafEQy4U5QbM61u8qZUObf3r7K1DFK exEV4ydhdRzlrcNXXJ3I7XCXEZdDrJlc73m8A0xwls+JqiRanL3hPtLLAi80/IxHbfCy QVrxSCj/DpBJEIa6VsOHPSRytnB6AWmjduXE4I13dm2j+tb5dHimedV8NhQlJJoLgDOU xrp+vcs8hEePUo0GoNizv8d5B1tCdfxpzQU2EmpYVAuYQs9wtGqNxASOEtUeSwkTbzKG hWCnKFn4sCd8SPmdS9ccfgSNyWl/A9PL0ySrXUvLaNN+7NZUCnYk7rF4c7VZB3UzDfzh wDZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=xAQXPiGqEvnwv7HCRdE1uet5LEyywV4k9x/p7B3wxS4=; b=f8T/Lq+XEY6n097nov48K89ALHTB3liubizIpCgVX9fvk7Z6ZWehCskV9ig/aEKuGk zKRO+x2l5hZS/X1KcIR1R6h6J9IUlKoQeHwy/Dg2StUZpQjTG4a0LusMlb4FEdS5IjHY rbdOVB5cJ9+0oWExU5qNd94DZYYmlzZ+EwTVhuyrWPRq2r5osNor5qBlf9W7YCtLg5CK DwoXaEWXwhTBkOzHNPchNr/erMg3oZbb1xCQU/MbDb+D/hyvxo92JpmYxl8MuKov/6h8 miDom34JozLB4Tvmksfboa6unlp+268Jb27CO7jgJ87dYQwskZPg+WWGadXqYRatWYlo uWhA== X-Gm-Message-State: ACgBeo2Noqp2w0Z18PEfHD3qQHsqqGU05J5sBEUTD8UVvaPaeqU/a0XW f5EsWkyzOxhUhN4A8UyKbSmmsidBw7bsKky+Klw= X-Google-Smtp-Source: AA6agR4/1E/Qdtsx+IEq3cJmGcJCXAhwktGqV2ppde8jcEaMCC5LP4GmmmmSuQXNUWjHpuZHEXU79hAE/c10V5xpkpQ= X-Received: by 2002:a17:907:272a:b0:731:4699:b375 with SMTP id d10-20020a170907272a00b007314699b375mr2506732ejl.633.1659883092252; Sun, 07 Aug 2022 07:38:12 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> In-Reply-To: <87wnbt3vnq.fsf@secretsauce.net> From: kobarity Date: Sun, 7 Aug 2022 23:37:59 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Dima Kogan Content-Type: multipart/mixed; boundary="00000000000015352e05e5a7a6f8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --00000000000015352e05e5a7a6f8 Content-Type: text/plain; charset="UTF-8" Hi, Dima Kogan wrote: > I do agree that the best thing to do is to use functions instead of pure > regexes here. Can we hook that into hs-special-modes-alist instead of > doing something specific in python-mode? I'm imagining extending the > meaning of the fields in hs-special-modes-alist, where we'd do something > different, depending on if some element is a string or not. Maybe that > would make it easier to extend the hideshow support for other languages? If we are to extend hs-special-modes-alist, I think it's better to add functions to find/check blocks. Maybe this is the third option mentioned in the first mail. For that, I added three functions to hs-special-modes-alist: - hs-find-block-beginning-func - hs-find-next-block-func - hs-looking-at-block-start-p-func Attached is a prototype patch to achieve this. Regards, --00000000000015352e05e5a7a6f8 Content-Type: application/octet-stream; name="56635-prototype.patch" Content-Disposition: attachment; filename="56635-prototype.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6jfh29i0 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVsIGIvbGlzcC9wcm9nbW9kZXMv aGlkZXNob3cuZWwKaW5kZXggZjU3NGVjODRmYi4uNmVlZjJjMzI3MSAxMDA2NDQKLS0tIGEvbGlz cC9wcm9nbW9kZXMvaGlkZXNob3cuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvaGlkZXNob3cuZWwK QEAgLTQzMyw2ICs0MzMsMTUgQEAgaHMtYWRqdXN0LWJsb2NrLWJlZ2lubmluZwogCiBTZWUgYGhz LWMtbGlrZS1hZGp1c3QtYmxvY2stYmVnaW5uaW5nJyBmb3IgYW4gZXhhbXBsZSBvZiB1c2luZyB0 aGlzLiIpCiAKKyhkZWZ2YXItbG9jYWwgaHMtZmluZC1ibG9jay1iZWdpbm5pbmctZnVuYyAjJ2hz LWZpbmQtYmxvY2stYmVnaW5uaW5nCisgICJGdW5jdGlvbiB1c2VkIHRvIGRvIGBocy1maW5kLWJs b2NrLWJlZ2lubmluZycuIikKKworKGRlZnZhci1sb2NhbCBocy1maW5kLW5leHQtYmxvY2stZnVu YyAjJ2hzLWZpbmQtbmV4dC1ibG9jaworICAiRnVuY3Rpb24gdXNlZCB0byBkbyBgaHMtZmluZC1u ZXh0LWJsb2NrJy4iKQorCisoZGVmdmFyLWxvY2FsIGhzLWxvb2tpbmctYXQtYmxvY2stc3RhcnQt cC1mdW5jICMnaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wCisgICJGdW5jdGlvbiB1c2VkIHRv IGRvIGhzLWxvb2tpbmctYXQtYmxvY2stc3RhcnQtcC4iKQorCiAoZGVmdmFyIGhzLWhlYWRsaW5l IG5pbAogICAiVGV4dCBvZiB0aGUgbGluZSB3aGVyZSBhIGhpZGRlbiBibG9jayBiZWdpbnMsIHNl dCBkdXJpbmcgaXNlYXJjaC4KIFlvdSBjYW4gZGlzcGxheSB0aGlzIGluIHRoZSBtb2RlIGxpbmUg YnkgYWRkaW5nIHRoZSBzeW1ib2wgYGhzLWhlYWRsaW5lJwpAQCAtNTY1LDcgKzU3NCw3IEBAIGhz LWhpZGUtYmxvY2stYXQtcG9pbnQKIGFuZCB0aGVuIGZ1cnRoZXIgYWRqdXN0ZWQgdG8gYmUgYXQg dGhlIGVuZCBvZiB0aGUgbGluZS4iCiAgIChpZiBjb21tZW50LXJlZwogICAgICAgKGhzLWhpZGUt Y29tbWVudC1yZWdpb24gKGNhciBjb21tZW50LXJlZykgKGNhZHIgY29tbWVudC1yZWcpIGVuZCkK LSAgICAod2hlbiAoaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wKQorICAgICh3aGVuIChmdW5j YWxsIGhzLWxvb2tpbmctYXQtYmxvY2stc3RhcnQtcC1mdW5jKQogICAgICAgKGxldCAoKG1kYXRh IChtYXRjaC1kYXRhIHQpKQogICAgICAgICAgICAgKGhlYWRlci1lbmQgKG1hdGNoLWVuZCAwKSkK ICAgICAgICAgICAgIHAgcSBvdikKQEAgLTY3Miw3ICs2ODEsMTQgQEAgaHMtZ3Jvay1tb2RlLXR5 cGUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg MCAoMS0gKG1hdGNoLWVuZCAwKSkpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYy1zdGFydC1yZWdleHApKSkKICAgICAgICAgICAgICAgaHMtZm9yd2FyZC1zZXhwLWZ1 bmMgKG9yIChudGggNCBsb29rdXApICMnZm9yd2FyZC1zZXhwKQotICAgICAgICAgICAgICBocy1h ZGp1c3QtYmxvY2stYmVnaW5uaW5nIChvciAobnRoIDUgbG9va3VwKSAjJ2lkZW50aXR5KSkpCisg ICAgICAgICAgICAgIGhzLWFkanVzdC1ibG9jay1iZWdpbm5pbmcgKG9yIChudGggNSBsb29rdXAp ICMnaWRlbnRpdHkpCisgICAgICAgICAgICAgIGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nLWZ1bmMg KG9yIChudGggNiBsb29rdXApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICMnaHMtZmluZC1ibG9jay1iZWdpbm5pbmcpCisgICAgICAgICAgICAgIGhzLWZp bmQtbmV4dC1ibG9jay1mdW5jIChvciAobnRoIDcgbG9va3VwKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIydocy1maW5kLW5leHQtYmxvY2spCisgICAgICAgICAg ICAgIGhzLWxvb2tpbmctYXQtYmxvY2stc3RhcnQtcC1mdW5jCisgICAgICAgICAgICAgIChvciAo bnRoIDggbG9va3VwKQorICAgICAgICAgICAgICAgICAgIydocy1sb29raW5nLWF0LWJsb2NrLXN0 YXJ0LXApKSkKICAgICAoc2V0cSBocy1taW5vci1tb2RlIG5pbCkKICAgICAoZXJyb3IgIiVzIE1v ZGUgZG9lc24ndCBzdXBwb3J0IEhpZGVzaG93IE1pbm9yIE1vZGUiCiAgICAgICAgICAgIChmb3Jt YXQtbW9kZS1saW5lIG1vZGUtbmFtZSkpKSkKQEAgLTY4Myw3ICs2OTksNyBAQCBocy1maW5kLWJs b2NrLWJlZ2lubmluZwogICAobGV0ICgoZG9uZSBuaWwpCiAgICAgICAgIChoZXJlIChwb2ludCkp KQogICAgIDs7IGxvb2sgaWYgY3VycmVudCBsaW5lIGlzIGJsb2NrIHN0YXJ0Ci0gICAgKGlmICho cy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXApCisgICAgKGlmIChmdW5jYWxsIGhzLWxvb2tpbmct YXQtYmxvY2stc3RhcnQtcC1mdW5jKQogICAgICAgICAocG9pbnQpCiAgICAgICA7OyBsb29rIGJh Y2t3YXJkIGZvciB0aGUgc3RhcnQgb2YgYSBibG9jayB0aGF0IGNvbnRhaW5zIHRoZSBjdXJzb3IK ICAgICAgICh3aGlsZSAoYW5kIChyZS1zZWFyY2gtYmFja3dhcmQgaHMtYmxvY2stc3RhcnQtcmVn ZXhwIG5pbCB0KQpAQCAtNjk4LDE5ICs3MTQsMjUgQEAgaHMtZmluZC1ibG9jay1iZWdpbm5pbmcK ICAgICAgICAgKGdvdG8tY2hhciBoZXJlKQogICAgICAgICBuaWwpKSkpCiAKKyhkZWZ1biBocy1m aW5kLW5leHQtYmxvY2sgKHJlZ2V4cCBtYXhwIHNraXAtY29tbWVudHMpCisgICJSZXBvc2l0aW9u IHBvaW50IGF0IG5leHQgYmxvY2stc3RhcnQuCitTa2lwIGNvbW1lbnRzIGlmIFNLSVAtQ09NTUVO VFMgaXMgbm90IG5pbCwgYW5kIHNlYXJjaCBmb3IgUkVHRVhQCitpbiByZWdpb24gKHBvaW50IE1B WFApLiIKKyAgKHdoZW4gc2tpcC1jb21tZW50cworICAgIChmb3J3YXJkLWNvbW1lbnQgKHBvaW50 LW1heCkpKQorICAoYW5kICg8IChwb2ludCkgbWF4cCkKKyAgICAgICAocmUtc2VhcmNoLWZvcndh cmQgcmVnZXhwIG1heHAgdCkpKQorCiAoZGVmdW4gaHMtaGlkZS1sZXZlbC1yZWN1cnNpdmUgKGFy ZyBtaW5wIG1heHApCiAgICJSZWN1cnNpdmVseSBoaWRlIGJsb2NrcyBBUkcgbGV2ZWxzIGJlbG93 IHBvaW50IGluIHJlZ2lvbiAoTUlOUCBNQVhQKS4iCi0gICh3aGVuIChocy1maW5kLWJsb2NrLWJl Z2lubmluZykKKyAgKHdoZW4gKGZ1bmNhbGwgaHMtZmluZC1ibG9jay1iZWdpbm5pbmctZnVuYykK ICAgICAoc2V0cSBtaW5wICgxKyAocG9pbnQpKSkKICAgICAoZnVuY2FsbCBocy1mb3J3YXJkLXNl eHAtZnVuYyAxKQogICAgIChzZXRxIG1heHAgKDEtIChwb2ludCkpKSkKICAgKHVubGVzcyBocy1h bGxvdy1uZXN0aW5nCiAgICAgKGhzLWRpc2NhcmQtb3ZlcmxheXMgbWlucCBtYXhwKSkKICAgKGdv dG8tY2hhciBtaW5wKQotICAod2hpbGUgKHByb2duCi0gICAgICAgICAgIChmb3J3YXJkLWNvbW1l bnQgKGJ1ZmZlci1zaXplKSkKLSAgICAgICAgICAgKGFuZCAoPCAocG9pbnQpIG1heHApCi0gICAg ICAgICAgICAgICAgKHJlLXNlYXJjaC1mb3J3YXJkIGhzLWJsb2NrLXN0YXJ0LXJlZ2V4cCBtYXhw IHQpKSkKKyAgKHdoaWxlIChmdW5jYWxsIGhzLWZpbmQtbmV4dC1ibG9jay1mdW5jIGhzLWJsb2Nr LXN0YXJ0LXJlZ2V4cCBtYXhwIHQpCiAgICAgKHdoZW4gKHNhdmUtbWF0Y2gtZGF0YQogCSAgICAo bm90IChudGggOCAoc3ludGF4LXBwc3MpKSkpIDsgbm90IGluc2lkZSBjb21tZW50cyBvciBzdHJp bmdzCiAgICAgICAoaWYgKD4gYXJnIDEpCkBAIC03NDcsOCArNzY5LDggQEAgaHMtYWxyZWFkeS1o aWRkZW4tcAogICAgICAgICAgIChnb3RvLWNoYXIgKG50aCAwIGMtcmVnKSkKICAgICAgICAgKGVu ZC1vZi1saW5lKQogICAgICAgICAod2hlbiAoYW5kIChub3QgYy1yZWcpCi0gICAgICAgICAgICAg ICAgICAgKGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nKQotCQkgICAoaHMtbG9va2luZy1hdC1ibG9j ay1zdGFydC1wKSkKKyAgICAgICAgICAgICAgICAgICAoZnVuY2FsbCBocy1maW5kLWJsb2NrLWJl Z2lubmluZy1mdW5jKQorCQkgICAoZnVuY2FsbCBocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXAt ZnVuYykpCiAgICAgICAgICAgOzsgcG9pbnQgaXMgaW5zaWRlIGEgYmxvY2sKICAgICAgICAgICAo Z290by1jaGFyIChtYXRjaC1lbmQgMCkpKSkpCiAgICAgKGVuZC1vZi1saW5lKQpAQCAtNzkwLDEw ICs4MTIsOCBAQCBocy1oaWRlLWFsbAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBocy1jLXN0YXJ0LXJlZ2V4cAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAi XFwpIikKICAgICAgICAgICAgICAgICAgICAgICAgICAiIikpKSkKLSAgICAgICAod2hpbGUgKHBy b2duCi0gICAgICAgICAgICAgICAgKHVubGVzcyBocy1oaWRlLWNvbW1lbnRzLXdoZW4taGlkaW5n LWFsbAotICAgICAgICAgICAgICAgICAgKGZvcndhcmQtY29tbWVudCAocG9pbnQtbWF4KSkpCi0g ICAgICAgICAgICAgICAgKHJlLXNlYXJjaC1mb3J3YXJkIHJlIChwb2ludC1tYXgpIHQpKQorICAg ICAgICh3aGlsZSAoZnVuY2FsbCBocy1maW5kLW5leHQtYmxvY2stZnVuYyByZSAocG9pbnQtbWF4 KQorICAgICAgICAgICAgICAgICAgICAgICAobm90IGhzLWhpZGUtY29tbWVudHMtd2hlbi1oaWRp bmctYWxsKSkKICAgICAgICAgIChpZiAobWF0Y2gtYmVnaW5uaW5nIDEpCiAgICAgICAgICAgICAg OzsgV2UgaGF2ZSBmb3VuZCBhIGJsb2NrIGJlZ2lubmluZy4KICAgICAgICAgICAgICAocHJvZ24K QEAgLTgzOCw4ICs4NTgsOCBAQCBocy1oaWRlLWJsb2NrCiAgICAgICAgICAgICAgICAgICAgICAg KDw9IChjb3VudC1saW5lcyAoY2FyIGMtcmVnKSAobnRoIDEgYy1yZWcpKSAxKSkpCiAgICAgICAg KG1lc3NhZ2UgIihub3QgZW5vdWdoIGNvbW1lbnQgbGluZXMgdG8gaGlkZSkiKSkKICAgICAgICgo b3IgYy1yZWcKLQkgICAoaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wKQotICAgICAgICAgICAo aHMtZmluZC1ibG9jay1iZWdpbm5pbmcpKQorCSAgIChmdW5jYWxsIGhzLWxvb2tpbmctYXQtYmxv Y2stc3RhcnQtcC1mdW5jKQorICAgICAgICAgICAoZnVuY2FsbCBocy1maW5kLWJsb2NrLWJlZ2lu bmluZy1mdW5jKSkKICAgICAgICAoaHMtaGlkZS1ibG9jay1hdC1wb2ludCBlbmQgYy1yZWcpCiAg ICAgICAgKHJ1bi1ob29rcyAnaHMtaGlkZS1ob29rKSkpKSkpCiAKQEAgLTg2OCw5ICs4ODgsOSBA QCBocy1zaG93LWJsb2NrCiAgICAgICAgICAgICAgKHdoZW4gKGNhciBjLXJlZykKICAgICAgICAg ICAgICAgIChzZXRxIHAgKGNhciBjLXJlZykKICAgICAgICAgICAgICAgICAgICAgIHEgKGNhZHIg Yy1yZWcpKSkpCi0gICAgICAgICAgICAoKGFuZCAoaHMtZmluZC1ibG9jay1iZWdpbm5pbmcpCisg ICAgICAgICAgICAoKGFuZCAoZnVuY2FsbCBocy1maW5kLWJsb2NrLWJlZ2lubmluZy1mdW5jKQog ICAgICAgICAgICAgICAgICAgOzsgdWdoLCBmcmVzaCBtYXRjaC1kYXRhCi0gICAgICAgICAgICAg ICAgICAoaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wKSkKKyAgICAgICAgICAgICAgICAgIChm dW5jYWxsIGhzLWxvb2tpbmctYXQtYmxvY2stc3RhcnQtcC1mdW5jKSkKICAgICAgICAgICAgICAo c2V0cSBwIChwb2ludCkKICAgICAgICAgICAgICAgICAgICBxIChwcm9nbiAoaHMtZm9yd2FyZC1z ZXhwIChtYXRjaC1kYXRhIHQpIDEpIChwb2ludCkpKSkpCiAgICAgICAod2hlbiAoYW5kIHAgcSkK ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBiL2xpc3AvcHJvZ21vZGVzL3B5 dGhvbi5lbAppbmRleCA4OGIxOWM4OGNkLi4zYmNhZGYxMjU0IDEwMDY0NAotLS0gYS9saXNwL3By b2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsCkBAIC0xNDk2 LDYgKzE0OTYsMTAgQEAgcHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtZGVmdW4tcmVnZXhwCiBUaGUg bmFtZSBvZiB0aGUgZGVmdW4gc2hvdWxkIGJlIGdyb3VwZWQgc28gaXQgY2FuIGJlIHJldHJpZXZl ZAogdmlhIGBtYXRjaC1zdHJpbmcnLiIpCiAKKyhkZWZ2YXIgcHl0aG9uLW5hdi1iZWdpbm5pbmct b2YtYmxvY2stcmVnZXhwCisgIChweXRob24tcnggbGluZS1zdGFydCAoKiBzcGFjZSkgYmxvY2st c3RhcnQpCisgICJSZWdleHAgbWF0Y2hpbmcgYmxvY2sgc3RhcnQuIikKKwogKGRlZnVuIHB5dGhv bi1uYXYtLWJlZ2lubmluZy1vZi1kZWZ1biAoJm9wdGlvbmFsIGFyZykKICAgIkludGVybmFsIGlt cGxlbWVudGF0aW9uIG9mIGBweXRob24tbmF2LWJlZ2lubmluZy1vZi1kZWZ1bicuCiBXaXRoIHBv c2l0aXZlIEFSRyBzZWFyY2ggYmFja3dhcmRzLCBlbHNlIHNlYXJjaCBmb3J3YXJkcy4iCkBAIC00 ODc3LDkgKzQ4ODEsMjkgQEAgcHl0aG9uLWRlc2NyaWJlLWF0LXBvaW50CiAoZGVmdW4gcHl0aG9u LWhpZGVzaG93LWZvcndhcmQtc2V4cC1mdW5jdGlvbiAoX2FyZykKICAgIlB5dGhvbiBzcGVjaWZp YyBgZm9yd2FyZC1zZXhwJyBmdW5jdGlvbiBmb3IgYGhzLW1pbm9yLW1vZGUnLgogQXJndW1lbnQg QVJHIGlzIGlnbm9yZWQuIgotICAocHl0aG9uLW5hdi1lbmQtb2YtZGVmdW4pCi0gICh1bmxlc3Mg KHB5dGhvbi1pbmZvLWN1cnJlbnQtbGluZS1lbXB0eS1wKQotICAgIChiYWNrd2FyZC1jaGFyKSkp CisgIChweXRob24tbmF2LWVuZC1vZi1ibG9jaykpCisKKyhkZWZ1biBweXRob24taGlkZXNob3ct ZmluZC1ibG9jay1iZWdpbm5pbmcgKCkKKyAgIlB5dGhvbiBzcGVjaWZpYyBgaHMtZmluZC1ibG9j ay1iZWdpbm5pbmcnIGZ1cm5jdGlvbiBmb3IgYGhzLW1pbm9yLW1vZGUnLiIKKyAgKGxldCAoKHN0 YXJ0aW5nLXBvcyAocG9pbnQpKQorICAgICAgICAoYmxvY2stYmVnaW5uaW5nKSkKKyAgICAoc2F2 ZS1leGN1cnNpb24KKyAgICAgICh3aGVuIChhbmQgKHB5dGhvbi1uYXYtYmVnaW5uaW5nLW9mLWJs b2NrKQorICAgICAgICAgICAgICAgICAoPD0gc3RhcnRpbmctcG9zIChzYXZlLWV4Y3Vyc2lvbiAo cHl0aG9uLW5hdi1lbmQtb2YtYmxvY2spKSkpCisgICAgICAgIChzZXRxIGJsb2NrLWJlZ2lubmlu ZyAocG9pbnQpKSkpCisgICAgKHdoZW4gYmxvY2stYmVnaW5uaW5nCisgICAgICAoZ290by1jaGFy IGJsb2NrLWJlZ2lubmluZykpKSkKKworKGRlZnVuIHB5dGhvbi1oaWRlc2hvdy1maW5kLW5leHQt YmxvY2sgKHJlZ2V4cCBtYXhwIF9za2lwLWNvbW1lbnRzKQorICAiUHl0aG9uIHNwZWNpZmljIGBo cy1maW5kLW5leHQtYmxvY2snIGZ1cm5jdGlvbiBmb3IgYGhzLW1pbm9yLW1vZGUnLgorQ2FsbCBg cHl0aG9uLW5hdi1mb3J3YXJkLWJsb2NrJyB0byBmaW5kIG5leHQgYmxvY2sgYW5kIGNoZWNrIGlm IHBvaW50IDw9IE1BWFAuCitSRUdFWFAgaXMgcGFzc2VkIHRvIGBsb29raW5nLWF0JyB0byBzZXQg YG1hdGNoLWRhdGEnLiIKKyAgKGxldCAoKG5leHQtYmxvY2sgKHNhdmUtZXhjdXJzaW9uIChweXRo b24tbmF2LWZvcndhcmQtYmxvY2spKSkpCisgICAgKHdoZW4gKGFuZCBuZXh0LWJsb2NrICg8PSBu ZXh0LWJsb2NrIG1heHApKQorICAgICAgKGdvdG8tY2hhciBuZXh0LWJsb2NrKQorICAgICAgKHNh dmUtZXhjdXJzaW9uCisgICAgICAgIChiZWdpbm5pbmctb2YtbGluZSkKKyAgICAgICAgKGxvb2tp bmctYXQgcmVnZXhwKSkpKSkKIAogDAogOzs7IEltZW51CkBAIC01Mzc2LDYgKzU0MDAsMTggQEAg cHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtZGVmdW4KICAgICAgICAgIChiZWdp bm5pbmctb2YtbGluZSAxKQogICAgICAgICAgKGxvb2tpbmctYXQgcHl0aG9uLW5hdi1iZWdpbm5p bmctb2YtZGVmdW4tcmVnZXhwKSkpKQogCisoZGVmdW4gcHl0aG9uLWluZm8tbG9va2luZy1hdC1i ZWdpbm5pbmctb2YtYmxvY2sgKCkKKyAgIkNoZWNrIGlmIHBvaW50IGlzIGF0IGJlZ2lubmluZyBv ZiBibG9jay4iCisgIChsZXQqICgobGluZS1iZWctcG9zIChsaW5lLWJlZ2lubmluZy1wb3NpdGlv bikpCisgICAgICAgICAobGluZS1jb250ZW50LXN0YXJ0ICgrIGxpbmUtYmVnLXBvcyAoY3VycmVu dC1pbmRlbnRhdGlvbikpKSkKKyAgICAoYW5kICg9IChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAg ICAgICAocHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2spKQorICAgICAgICAgICAgbGluZS1j b250ZW50LXN0YXJ0KQorICAgICAgICAgKDw9IChwb2ludCkgbGluZS1jb250ZW50LXN0YXJ0KQor ICAgICAgICAgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAgIChiZWdpbm5pbmctb2YtbGluZSkK KyAgICAgICAgICAgKGxvb2tpbmctYXQgcHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2stcmVn ZXhwKSkpKSkKKwogKGRlZnVuIHB5dGhvbi1pbmZvLWN1cnJlbnQtbGluZS1jb21tZW50LXAgKCkK ICAgIlJldHVybiBub24tbmlsIGlmIGN1cnJlbnQgbGluZSBpcyBhIGNvbW1lbnQgbGluZS4iCiAg IChjaGFyLWVxdWFsCkBAIC01ODI1LDE0ICs1ODYxLDE3IEBAIHB5dGhvbi1tb2RlCiAKICAgKGFk ZC10by1saXN0CiAgICAnaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdAotICAgJyhweXRob24tbW9kZQot ICAgICAiXFxzLSpcXF88XFwoPzpkZWZcXHxjbGFzc1xcKVxcXz4iCisgICBgKHB5dGhvbi1tb2Rl CisgICAgICxweXRob24tbmF2LWJlZ2lubmluZy1vZi1ibG9jay1yZWdleHAKICAgICAgOzsgVXNl IHRoZSBlbXB0eSBzdHJpbmcgYXMgZW5kIHJlZ2V4cCBzbyBpdCBkb2Vzbid0IGRlZmF1bHQgdG8K ICAgICAgOzsgIlxccykiLiAgVGhpcyB3YXkgcGFyZW5zIGF0IGVuZCBvZiBkZWZ1biBhcmUgcHJv cGVybHkgaGlkZGVuLgogICAgICAiIgogICAgICAiIyIKICAgICAgcHl0aG9uLWhpZGVzaG93LWZv cndhcmQtc2V4cC1mdW5jdGlvbgotICAgICBuaWwpKQorICAgICBuaWwKKyAgICAgcHl0aG9uLWhp ZGVzaG93LWZpbmQtYmxvY2stYmVnaW5uaW5nCisgICAgIHB5dGhvbi1oaWRlc2hvdy1maW5kLW5l eHQtYmxvY2sKKyAgICAgcHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2sp KQogCiAgIChzZXRxLWxvY2FsIG91dGxpbmUtcmVnZXhwIChweXRob24tcnggKCogc3BhY2UpIGJs b2NrLXN0YXJ0KSkKICAgKHNldHEtbG9jYWwgb3V0bGluZS1oZWFkaW5nLWVuZC1yZWdleHAgIjpb XlxuXSpcbiIpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5l bCBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCmluZGV4IGViNTcxMjI2OTAu LmU1MzQ4ZmRkZTQgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3Rz LmVsCisrKyBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCkBAIC01OTU2LDgg KzU5NTYsMTEgQEAgcHl0aG9uLWhpZGVzaG93LWhpZGUtbGV2ZWxzLTEKIGNsYXNzIFNvbWVDbGFz czoKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBhcmcsIGt3YXJnPTEpOgorCiAgICAgZGVmIGZp bHRlcihzZWxmLCBudW1zKToKLSAgICBkZWYgX19zdHJfXyhzZWxmKToiKSkpKQorCisgICAgZGVm IF9fc3RyX18oc2VsZik6CisiKSkpKQogICAgICAgKG9yIGVuYWJsZWQgKGhzLW1pbm9yLW1vZGUg LTEpKSkpKQogCiAoZXJ0LWRlZnRlc3QgcHl0aG9uLWhpZGVzaG93LWhpZGUtbGV2ZWxzLTIgKCkK --00000000000015352e05e5a7a6f8-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 08 11:16:12 2022 Received: (at 56635) by debbugs.gnu.org; 8 Aug 2022 15:16:12 +0000 Received: from localhost ([127.0.0.1]:41544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4UG-0005Ak-7I for submit@debbugs.gnu.org; Mon, 08 Aug 2022 11:16:12 -0400 Received: from mail-ej1-f46.google.com ([209.85.218.46]:41850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4UE-0005AX-Q7 for 56635@debbugs.gnu.org; Mon, 08 Aug 2022 11:16:11 -0400 Received: by mail-ej1-f46.google.com with SMTP id gk3so17161486ejb.8 for <56635@debbugs.gnu.org>; Mon, 08 Aug 2022 08:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc; bh=tUVo3QYIZY03nNWbRj5Yvjpa7CrVPc8Ay5Grt1kyNiw=; b=dekDCZb3Wy2LZ1XZKEDHiLlgGhg3u0nwCP0UgeT6/rkCIko6/nG9w9uAD6I1QYqGDf eMUzUGHOZKLvEwQwUiDU/Ln3kcZZUrypTDqaaqW8H2MgwV3bN0wphyhsbL8rUAZltNJI byfqODtyLEdM/DnjNTYLaQ0AJ+07unKyCwvPKo6m7g1EdTdkBjuC7n2qpVPCF73xS+xp rtiyLZ4RGX8kmQHODguLsr724UieKthubjQEbdKaXTIRsRL45LrmrAtQ8/F3cyvsX/C3 KFGfdJn/4fap83VCoXOk3ft8Zi8j6Ju0PbBtboYxob1Aa/GneFU69iPSuHREFYR7cWoJ V9yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc; bh=tUVo3QYIZY03nNWbRj5Yvjpa7CrVPc8Ay5Grt1kyNiw=; b=nWmiHOkkXcN8cpTg68cR8nWaRds9ZYK+fb1/2wcXH4SPGIFF/1qCzN1fd+kMKkpANG TjKTp+r4IbEVnNPmf3FrnF/Wlc+Nfgg+RqsbvobmR/6zjMlTCo7hyGmlcWDQWC9EHMPX i1+nC/lFE2ljEospaDsHMVEaFKyybw6gXwMSYQbTlqR2E9puG9phqcHeSSSudX2Lwote AngdPjjkNpiYj0WVdTzwVEhS4p3AuNvavMYZlFFgQys1tKQ5C20iYrIUHeEQnrenr5Iw 2uDmGXUSOAK/doQDckQcZ8Arfq7R6Ikqd/nnZLPn9awqEBzm8nUTjhMMX+GW3n+Yh3YK saIA== X-Gm-Message-State: ACgBeo0kHoPE2H5dFz6rZdWEDYlbyJAnYIMwG6RJZJI5a78wGDQcVIcy bQqYHpyZbjV/pBYZ9ITrlDkqrrq5Y0Y= X-Google-Smtp-Source: AA6agR5h+z2nHPkHAVadLEID0uRoMhfxDRaK8GGBsW7BVzOYamA9V0DxWpQnmeFiXl+mO639wNyJVw== X-Received: by 2002:a17:907:7254:b0:731:61c6:ecf9 with SMTP id ds20-20020a170907725400b0073161c6ecf9mr3373663ejc.101.1659971764545; Mon, 08 Aug 2022 08:16:04 -0700 (PDT) Received: from ars3 ([2a02:8109:8ac0:56d0::dc4d]) by smtp.gmail.com with ESMTPSA id p25-20020a17090653d900b007310a9ae436sm3925668ejo.112.2022.08.08.08.16.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Aug 2022 08:16:03 -0700 (PDT) From: Augusto Stoffel To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks In-Reply-To: (kobarity@gmail.com's message of "Sun, 7 Aug 2022 23:37:59 +0900") References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> Date: Mon, 08 Aug 2022 17:16:02 +0200 Message-ID: <878rnyg40d.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a marginally related remark, but I noticed that python-mode sets (setq-local outline-heading-end-regexp ":[^\n]*\n") and this doesn't work well with the new-ish type annotation syntax. Wouldn't it be better to simply remove this setting, reverting back to the default "\n"? Then folding by outline-minor-mode would behave like hideshow currently does when it comes to something like def f( x: int ) -> int: pass On Sun, 7 Aug 2022 at 23:37, kobarity wrote: > Hi, > > Dima Kogan wrote: >> I do agree that the best thing to do is to use functions instead of pure >> regexes here. Can we hook that into hs-special-modes-alist instead of >> doing something specific in python-mode? I'm imagining extending the >> meaning of the fields in hs-special-modes-alist, where we'd do something >> different, depending on if some element is a string or not. Maybe that >> would make it easier to extend the hideshow support for other languages? > > If we are to extend hs-special-modes-alist, I think it's better to add > functions to find/check blocks. Maybe this is the third option > mentioned in the first mail. For that, I added three functions to > hs-special-modes-alist: > > - hs-find-block-beginning-func > - hs-find-next-block-func > - hs-looking-at-block-start-p-func > > Attached is a prototype patch to achieve this. > > Regards, From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 13 08:37:20 2022 Received: (at 56635) by debbugs.gnu.org; 13 Aug 2022 12:37:20 +0000 Received: from localhost ([127.0.0.1]:60022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMqOG-0005LM-Dv for submit@debbugs.gnu.org; Sat, 13 Aug 2022 08:37:20 -0400 Received: from mail-ed1-f49.google.com ([209.85.208.49]:44658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oMqOD-0005Kv-DY for 56635@debbugs.gnu.org; Sat, 13 Aug 2022 08:37:18 -0400 Received: by mail-ed1-f49.google.com with SMTP id t5so4223012edc.11 for <56635@debbugs.gnu.org>; Sat, 13 Aug 2022 05:37:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=a8djiyCuvz965ToKS8IPUObxC2nYFkxedcE4UgZ0h+4=; b=FIR+9PFT89KKXTOcdrsQMR+V5mYIvScMNFkBR2wZRrYIx7xjvw+EZkcZB7xD/k9Y3D bA/MWCFON/OMVO7vzapnF5/mLeyIPT/V+cOZL6RoS14NoVh61NCFQUNfLWuK7srWyMDQ c0bjCr+8/5+bIhBLA0F9c9wQRalXfgLVMSPpF5Yv7qXIJDj9FD0zKa/O2w6XZsEPawcS zxZnGlb7sytHncP9pPK/eYsUum6Nnbl6lDZ/achhguo27FXFpmcsdSHP0bt3jcscgpd9 QiT5Ct5ggd1ZtSXBVknLweZUiUbjMywPIOCCKOn06TPd3XykMtYZbkwNT8bvYQb2ggFJ BG9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=a8djiyCuvz965ToKS8IPUObxC2nYFkxedcE4UgZ0h+4=; b=w6VDfzt/mc2PJdFfEAWhpzcRHUUHjWLiwYvRkBStt/D0SFACH8PeHCjQ9mJGEmHFIX tgCgj5zYyBFMyWx3ljaVYKkBWAW9nX4YypAw2m/bl0PSFGZhXXx5g71nSBJVgM4BFhwC MZVGD+z9kDMmgwsjLIeP/Ile++8jMqFk4067YcrREA5gxzgcPI6aX0zpzpsgStBdUbbz iPrLXbu9aoejt/Otf/Ws23k+lNJU/F5WToTMfHCHus9fXid4UG3yQ6YIPFguDmB/5Zvo P3J3I75FNQvUDN7vVVF7O84kfSiUv0GsgjR/TaouFRw9rscKKGZOTsf6qOfQl9ybGOqt sy1A== X-Gm-Message-State: ACgBeo1P22l2YeizNJEY32iGARR0awVXfvl2X6qNgUPqc0B38B6Urlfr S/hvh89zDI+LyARfV/O37+WRA/sM5bfw+GKsu44= X-Google-Smtp-Source: AA6agR7vrRfnveyWqih8Kzaya1u7+fMiUgSQVE1BDOHORAUHdwWSK0tZjtTFm1qzeblfpjCxvzfFdDT18SyXwUmFRGQ= X-Received: by 2002:a05:6402:331d:b0:43d:9e2e:6966 with SMTP id e29-20020a056402331d00b0043d9e2e6966mr7487916eda.214.1660394231525; Sat, 13 Aug 2022 05:37:11 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> In-Reply-To: <878rnyg40d.fsf@gmail.com> From: kobarity Date: Sat, 13 Aug 2022 21:36:57 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Augusto Stoffel Content-Type: multipart/mixed; boundary="0000000000005bbc8a05e61ea8c1" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --0000000000005bbc8a05e61ea8c1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Augusto Stoffel wrote: > > This is a marginally related remark, but I noticed that python-mode sets > > (setq-local outline-heading-end-regexp ":[^\n]*\n") > > and this doesn't work well with the new-ish type annotation syntax. > > Wouldn't it be better to simply remove this setting, reverting back to > the default "\n"? Then folding by outline-minor-mode would behave like > hideshow currently does when it comes to something like > > def f( > x: int > ) -> int: > pass I agree with removing the `outline-heading-end-regexp' setting. I thought about adding a custom variable since some people might prefer the current setting, but I reconsidered that setting it as a file local variable would be sufficient as described in docstring: #+begin_quote The recommended way to set this is with a =E2=80=98Local Variables:=E2=80= =99 list in the file it applies to. #+end_quote Is there any comments on extending `hs-special-modes-alist'? Attached are revised patches. I would like to know if it is worth extending `hs-special-modes-alist'. Best Regards, --0000000000005bbc8a05e61ea8c1 Content-Type: application/octet-stream; name="fix-56635-hideshow.patch" Content-Disposition: attachment; filename="fix-56635-hideshow.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6rvokyx0 Y29tbWl0IGIxNjM1Njc2MTBmMzA5ZjFmZDI2NGJjYjQ2YmI4MWM2ZjgwMTNjZGUKQXV0aG9yOiBr b2Jhcml0eSA8a29iYXJpdHlAZ21haWwuY29tPgpEYXRlOiAgIFNhdCBBdWcgMTMgMTY6MjI6NDAg MjAyMiArMDkwMAoKICAgIEV4dGVuZCBgaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdCcgZm9yIGxhbmd1 YWdlcyBzdWNoIGFzIFB5dGhvbgogICAgCiAgICAqIGxpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVs IChocy1zcGVjaWFsLW1vZGVzLWFsaXN0KTogQWRkCiAgICBlbGVtZW50cyBGSU5ELUJMT0NLLUJF R0lOTklORy1GVU5DLCBGSU5ELU5FWFQtQkxPQ0stRlVOQywgYW5kCiAgICBMT09LSU5HLUFULUJM T0NLLVNUQVJULVAtRlVOQy4KICAgIChocy1maW5kLWJsb2NrLWJlZ2lubmluZy1mdW5jKTogTmV3 IHZhcmlhYmxlIHRvIGhvbGQKICAgIEZJTkQtQkxPQ0stQkVHSU5OSU5HLUZVTkMuCiAgICAoaHMt ZmluZC1uZXh0LWJsb2NrLWZ1bmMpOiBOZXcgdmFyaWFibGUgdG8gaG9sZAogICAgRklORC1ORVhU LUJMT0NLLUZVTkMuCiAgICAoaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wLWZ1bmMpOiBOZXcg dmFyaWFibGUgdG8gaG9sZAogICAgTE9PS0lORy1BVC1CTE9DSy1TVEFSVC1QLUZVTkMuCiAgICAo aHMtZ3Jvay1tb2RlLXR5cGUpOiBTZXQgbmV3IHZhcmlhYmxlcyBmcm9tCiAgICBgaHMtc3BlY2lh bC1tb2Rlcy1hbGlzdCcuCiAgICAoaHMtZmluZC1uZXh0LWJsb2NrKTogTmV3IGZ1bmN0aW9uLgog ICAgKE1pc2MuKTogVXBkYXRlIGNhbGxlcnMgb2YgdGhlIGFib3ZlIGZ1bmN0aW9ucy4KICAgIAog ICAgKiB0ZXN0L2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LXRlc3RzLmVsOiBOZXcgdGVzdCBmaWxl LgoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVsIGIvbGlzcC9wcm9nbW9k ZXMvaGlkZXNob3cuZWwKaW5kZXggZjU3NGVjODRmYi4uYzA3OTZmYzJlZSAxMDA2NDQKLS0tIGEv bGlzcC9wcm9nbW9kZXMvaGlkZXNob3cuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvaGlkZXNob3cu ZWwKQEAgLTI2Nyw3ICsyNjcsOSBAQCBocy1zcGVjaWFsLW1vZGVzLWFsaXN0CiAgICAgKSkKICAg IkFsaXN0IGZvciBpbml0aWFsaXppbmcgdGhlIGhpZGVzaG93IHZhcmlhYmxlcyBmb3IgZGlmZmVy ZW50IG1vZGVzLgogRWFjaCBlbGVtZW50IGhhcyB0aGUgZm9ybQotICAoTU9ERSBTVEFSVCBFTkQg Q09NTUVOVC1TVEFSVCBGT1JXQVJELVNFWFAtRlVOQyBBREpVU1QtQkVHLUZVTkMpLgorICAoTU9E RSBTVEFSVCBFTkQgQ09NTUVOVC1TVEFSVCBGT1JXQVJELVNFWFAtRlVOQyBBREpVU1QtQkVHLUZV TkMKKyAgIEZJTkQtQkxPQ0stQkVHSU5OSU5HLUZVTkMgRklORC1ORVhULUJMT0NLLUZVTkMKKyAg IExPT0tJTkctQVQtQkxPQ0stU1RBUlQtUC1GVU5DKS4KIAogSWYgbm9uLW5pbCwgaGlkZXNob3cg d2lsbCB1c2UgdGhlc2UgdmFsdWVzIGFzIHJlZ2V4cHMgdG8gZGVmaW5lIGJsb2NrcwogYW5kIGNv bW1lbnRzLCByZXNwZWN0aXZlbHkgZm9yIG1ham9yIG1vZGUgTU9ERS4KQEAgLTI4OCw2ICsyOTAs MTUgQEAgaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdAogU2VlIHRoZSBkb2N1bWVudGF0aW9uIGZvciBg aHMtYWRqdXN0LWJsb2NrLWJlZ2lubmluZycgdG8gc2VlIHdoYXQgaXMgdGhlCiB1c2Ugb2YgQURK VVNULUJFRy1GVU5DLgogCitTZWUgdGhlIGRvY3VtZW50YXRpb24gZm9yIGBocy1maW5kLWJsb2Nr LWJlZ2lubmluZy1mdW5jJyB0byBzZWUKK3doYXQgaXMgdGhlIHVzZSBvZiBGSU5ELUJMT0NLLUJF R0lOTklORy1GVU5DLgorCitTZWUgdGhlIGRvY3VtZW50YXRpb24gZm9yIGBocy1maW5kLW5leHQt YmxvY2stZnVuYycgdG8gc2VlIHdoYXQKK2lzIHRoZSB1c2Ugb2YgRklORC1ORVhULUJMT0NLLUZV TkMuCisKK1NlZSB0aGUgZG9jdW1lbnRhdGlvbiBmb3IgYGhzLWxvb2tpbmctYXQtYmxvY2stc3Rh cnQtcC1mdW5jJyB0bworc2VlIHdoYXQgaXMgdGhlIHVzZSBvZiBMT09LSU5HLUFULUJMT0NLLVNU QVJULVAtRlVOQy4KKwogSWYgYW55IG9mIHRoZSBlbGVtZW50cyBpcyBsZWZ0IG5pbCBvciBvbWl0 dGVkLCBoaWRlc2hvdyB0cmllcyB0byBndWVzcwogYXBwcm9wcmlhdGUgdmFsdWVzLiAgVGhlIHJl Z2V4cHMgc2hvdWxkIG5vdCBjb250YWluIGxlYWRpbmcgb3IgdHJhaWxpbmcKIHdoaXRlc3BhY2Uu ICBDYXNlIGRvZXMgbm90IG1hdHRlci4iKQpAQCAtNDMzLDYgKzQ0NCwzOSBAQCBocy1hZGp1c3Qt YmxvY2stYmVnaW5uaW5nCiAKIFNlZSBgaHMtYy1saWtlLWFkanVzdC1ibG9jay1iZWdpbm5pbmcn IGZvciBhbiBleGFtcGxlIG9mIHVzaW5nIHRoaXMuIikKIAorKGRlZnZhci1sb2NhbCBocy1maW5k LWJsb2NrLWJlZ2lubmluZy1mdW5jICMnaHMtZmluZC1ibG9jay1iZWdpbm5pbmcKKyAgIkZ1bmN0 aW9uIHVzZWQgdG8gZG8gYGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nJy4KK0l0IHNob3VsZCByZXBv c2l0aW9uIHBvaW50IGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIGN1cnJlbnQgYmxvY2sKK2FuZCBy ZXR1cm4gcG9pbnQsIG9yIG5pbCBpZiBvcmlnaW5hbCBwb2ludCB3YXMgbm90IGluIGEgYmxvY2su CisKK1NwZWNpZnlpbmcgdGhpcyBmdW5jdGlvbiBpcyBuZWNlc3NhcnkgZm9yIGxhbmd1YWdlcyBz dWNoIGFzCitQeXRob24sIHdoZXJlIHJlZ2V4cCBzZWFyY2ggYW5kIGBzeW50YXgtcHBzcycgY2hl Y2sgaXMgbm90IGVub3VnaAordG8gZmluZCB0aGUgYmVnaW5uaW5nIG9mIHRoZSBjdXJyZW50IGJs b2NrLiIpCisKKyhkZWZ2YXItbG9jYWwgaHMtZmluZC1uZXh0LWJsb2NrLWZ1bmMgIydocy1maW5k LW5leHQtYmxvY2sKKyAgIkZ1bmN0aW9uIHVzZWQgdG8gZG8gYGhzLWZpbmQtbmV4dC1ibG9jaycu CitJdCBzaG91bGQgcmVwb3NpdGlvbiBwb2ludCBhdCBuZXh0IGJsb2NrIHN0YXJ0LgorCitJdCBp cyBjYWxsZWQgd2l0aCB0aHJlZSBhcmd1bWVudHMgUkVHRVhQLCBNQVhQLCBhbmQgQ09NTUVOVFMu CitSRUdFWFAgaXMgYSByZWdleHAgcmVwcmVzZW50aW5nIGJsb2NrIHN0YXJ0LiAgV2hlbiBibG9j ayBzdGFydCBpcworZm91bmQsIGBtYXRjaC1kYXRhJyBzaG91bGQgYmUgc2V0IHVzaW5nIFJFR0VY UC4gIE1BWFAgaXMgYSBidWZmZXIKK3Bvc2l0aW9uIHRoYXQgYm91bmRzIHRoZSBzZWFyY2guICBX aGVuIENPTU1FTlRTIGlzIG5pbCwgY29tbWVudHMKK3Nob3VsZCBiZSBza2lwcGVkLiAgV2hlbiBD T01NRU5UUyBpcyBub3QgbmlsLCBSRUdFWFAgbWF0Y2hlcyBub3QKK29ubHkgYmVnaW5uaW5nIG9m IGEgYmxvY2sgYnV0IGFsc28gYmVnaW5uaW5nIG9mIGEgY29tbWVudC4gIEluCit0aGlzIGNhc2Us IHRoZSBmdW5jdGlvbiBzaG91bGQgZmluZCBuZWFyZXN0IGJsb2NrIG9yIGNvbW1lbnQuCisKK1Nw ZWNpZnlpbmcgdGhpcyBmdW5jdGlvbiBpcyBuZWNlc3NhcnkgZm9yIGxhbmd1YWdlcyBzdWNoIGFz CitQeXRob24sIHdoZXJlIHJlZ2V4cCBzZWFyY2ggaXMgbm90IGVub3VnaCB0byBmaW5kIHRoZSBi ZWdpbm5pbmcKK29mIHRoZSBuZXh0IGJsb2NrLiIpCisKKyhkZWZ2YXItbG9jYWwgaHMtbG9va2lu Zy1hdC1ibG9jay1zdGFydC1wLWZ1bmMgIydocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXAKKyAg IkZ1bmN0aW9uIHVzZWQgdG8gZG8gYGhzLWxvb2tpbmctYXQtYmxvY2stc3RhcnQtcCcuCitJdCBz aG91bGQgcmV0dXJuIG5vbi1uaWwgaWYgdGhlIHBvaW50IGlzIGF0IHRoZSBibG9jayBzdGFydC4K KworU3BlY2lmeWluZyB0aGlzIGZ1bmN0aW9uIGlzIG5lY2Vzc2FyeSBmb3IgbGFuZ3VhZ2VzIHN1 Y2ggYXMKK1B5dGhvbiwgd2hlcmUgYGxvb2tpbmctYXQnIGFuZCBgc3ludGF4LXBwc3MnIGNoZWNr IGlzIG5vdCBlbm91Z2gKK3RvIGNoZWNrIGlmIHRoZSBwb2ludCBpcyBhdCB0aGUgYmxvY2sgc3Rh cnQuIikKKwogKGRlZnZhciBocy1oZWFkbGluZSBuaWwKICAgIlRleHQgb2YgdGhlIGxpbmUgd2hl cmUgYSBoaWRkZW4gYmxvY2sgYmVnaW5zLCBzZXQgZHVyaW5nIGlzZWFyY2guCiBZb3UgY2FuIGRp c3BsYXkgdGhpcyBpbiB0aGUgbW9kZSBsaW5lIGJ5IGFkZGluZyB0aGUgc3ltYm9sIGBocy1oZWFk bGluZScKQEAgLTU2NSw3ICs2MDksNyBAQCBocy1oaWRlLWJsb2NrLWF0LXBvaW50CiBhbmQgdGhl biBmdXJ0aGVyIGFkanVzdGVkIHRvIGJlIGF0IHRoZSBlbmQgb2YgdGhlIGxpbmUuIgogICAoaWYg Y29tbWVudC1yZWcKICAgICAgIChocy1oaWRlLWNvbW1lbnQtcmVnaW9uIChjYXIgY29tbWVudC1y ZWcpIChjYWRyIGNvbW1lbnQtcmVnKSBlbmQpCi0gICAgKHdoZW4gKGhzLWxvb2tpbmctYXQtYmxv Y2stc3RhcnQtcCkKKyAgICAod2hlbiAoZnVuY2FsbCBocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0 LXAtZnVuYykKICAgICAgIChsZXQgKChtZGF0YSAobWF0Y2gtZGF0YSB0KSkKICAgICAgICAgICAg IChoZWFkZXItZW5kIChtYXRjaC1lbmQgMCkpCiAgICAgICAgICAgICBwIHEgb3YpCkBAIC02NzIs NyArNzE2LDE0IEBAIGhzLWdyb2stbW9kZS10eXBlCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAgKDEtIChtYXRjaC1lbmQgMCkpKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGMtc3RhcnQtcmVnZXhwKSkpCiAgICAg ICAgICAgICAgIGhzLWZvcndhcmQtc2V4cC1mdW5jIChvciAobnRoIDQgbG9va3VwKSAjJ2Zvcndh cmQtc2V4cCkKLSAgICAgICAgICAgICAgaHMtYWRqdXN0LWJsb2NrLWJlZ2lubmluZyAob3IgKG50 aCA1IGxvb2t1cCkgIydpZGVudGl0eSkpKQorICAgICAgICAgICAgICBocy1hZGp1c3QtYmxvY2st YmVnaW5uaW5nIChvciAobnRoIDUgbG9va3VwKSAjJ2lkZW50aXR5KQorICAgICAgICAgICAgICBo cy1maW5kLWJsb2NrLWJlZ2lubmluZy1mdW5jIChvciAobnRoIDYgbG9va3VwKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjJ2hzLWZpbmQtYmxvY2stYmVn aW5uaW5nKQorICAgICAgICAgICAgICBocy1maW5kLW5leHQtYmxvY2stZnVuYyAob3IgKG50aCA3 IGxvb2t1cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMnaHMt ZmluZC1uZXh0LWJsb2NrKQorICAgICAgICAgICAgICBocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0 LXAtZnVuYworICAgICAgICAgICAgICAob3IgKG50aCA4IGxvb2t1cCkKKyAgICAgICAgICAgICAg ICAgICMnaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wKSkpCiAgICAgKHNldHEgaHMtbWlub3It bW9kZSBuaWwpCiAgICAgKGVycm9yICIlcyBNb2RlIGRvZXNuJ3Qgc3VwcG9ydCBIaWRlc2hvdyBN aW5vciBNb2RlIgogICAgICAgICAgICAoZm9ybWF0LW1vZGUtbGluZSBtb2RlLW5hbWUpKSkpCkBA IC02ODMsNyArNzM0LDcgQEAgaHMtZmluZC1ibG9jay1iZWdpbm5pbmcKICAgKGxldCAoKGRvbmUg bmlsKQogICAgICAgICAoaGVyZSAocG9pbnQpKSkKICAgICA7OyBsb29rIGlmIGN1cnJlbnQgbGlu ZSBpcyBibG9jayBzdGFydAotICAgIChpZiAoaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wKQor ICAgIChpZiAoZnVuY2FsbCBocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXAtZnVuYykKICAgICAg ICAgKHBvaW50KQogICAgICAgOzsgbG9vayBiYWNrd2FyZCBmb3IgdGhlIHN0YXJ0IG9mIGEgYmxv Y2sgdGhhdCBjb250YWlucyB0aGUgY3Vyc29yCiAgICAgICAod2hpbGUgKGFuZCAocmUtc2VhcmNo LWJhY2t3YXJkIGhzLWJsb2NrLXN0YXJ0LXJlZ2V4cCBuaWwgdCkKQEAgLTY5OCwxOSArNzQ5LDI1 IEBAIGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nCiAgICAgICAgIChnb3RvLWNoYXIgaGVyZSkKICAg ICAgICAgbmlsKSkpKQogCisoZGVmdW4gaHMtZmluZC1uZXh0LWJsb2NrIChyZWdleHAgbWF4cCBj b21tZW50cykKKyAgIlJlcG9zaXRpb24gcG9pbnQgYXQgbmV4dCBibG9jay1zdGFydC4KK1NraXAg Y29tbWVudHMgaWYgQ09NTUVOVFMgaXMgbmlsLCBhbmQgc2VhcmNoIGZvciBSRUdFWFAgaW4KK3Jl Z2lvbiAocG9pbnQgTUFYUCkuIgorICAod2hlbiAobm90IGNvbW1lbnRzKQorICAgIChmb3J3YXJk LWNvbW1lbnQgKHBvaW50LW1heCkpKQorICAoYW5kICg8IChwb2ludCkgbWF4cCkKKyAgICAgICAo cmUtc2VhcmNoLWZvcndhcmQgcmVnZXhwIG1heHAgdCkpKQorCiAoZGVmdW4gaHMtaGlkZS1sZXZl bC1yZWN1cnNpdmUgKGFyZyBtaW5wIG1heHApCiAgICJSZWN1cnNpdmVseSBoaWRlIGJsb2NrcyBB UkcgbGV2ZWxzIGJlbG93IHBvaW50IGluIHJlZ2lvbiAoTUlOUCBNQVhQKS4iCi0gICh3aGVuICho cy1maW5kLWJsb2NrLWJlZ2lubmluZykKKyAgKHdoZW4gKGZ1bmNhbGwgaHMtZmluZC1ibG9jay1i ZWdpbm5pbmctZnVuYykKICAgICAoc2V0cSBtaW5wICgxKyAocG9pbnQpKSkKICAgICAoZnVuY2Fs bCBocy1mb3J3YXJkLXNleHAtZnVuYyAxKQogICAgIChzZXRxIG1heHAgKDEtIChwb2ludCkpKSkK ICAgKHVubGVzcyBocy1hbGxvdy1uZXN0aW5nCiAgICAgKGhzLWRpc2NhcmQtb3ZlcmxheXMgbWlu cCBtYXhwKSkKICAgKGdvdG8tY2hhciBtaW5wKQotICAod2hpbGUgKHByb2duCi0gICAgICAgICAg IChmb3J3YXJkLWNvbW1lbnQgKGJ1ZmZlci1zaXplKSkKLSAgICAgICAgICAgKGFuZCAoPCAocG9p bnQpIG1heHApCi0gICAgICAgICAgICAgICAgKHJlLXNlYXJjaC1mb3J3YXJkIGhzLWJsb2NrLXN0 YXJ0LXJlZ2V4cCBtYXhwIHQpKSkKKyAgKHdoaWxlIChmdW5jYWxsIGhzLWZpbmQtbmV4dC1ibG9j ay1mdW5jIGhzLWJsb2NrLXN0YXJ0LXJlZ2V4cCBtYXhwIG5pbCkKICAgICAod2hlbiAoc2F2ZS1t YXRjaC1kYXRhCiAJICAgIChub3QgKG50aCA4IChzeW50YXgtcHBzcykpKSkgOyBub3QgaW5zaWRl IGNvbW1lbnRzIG9yIHN0cmluZ3MKICAgICAgIChpZiAoPiBhcmcgMSkKQEAgLTc0Nyw4ICs4MDQs OCBAQCBocy1hbHJlYWR5LWhpZGRlbi1wCiAgICAgICAgICAgKGdvdG8tY2hhciAobnRoIDAgYy1y ZWcpKQogICAgICAgICAoZW5kLW9mLWxpbmUpCiAgICAgICAgICh3aGVuIChhbmQgKG5vdCBjLXJl ZykKLSAgICAgICAgICAgICAgICAgICAoaHMtZmluZC1ibG9jay1iZWdpbm5pbmcpCi0JCSAgICho cy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXApKQorICAgICAgICAgICAgICAgICAgIChmdW5jYWxs IGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nLWZ1bmMpCisJCSAgIChmdW5jYWxsIGhzLWxvb2tpbmct YXQtYmxvY2stc3RhcnQtcC1mdW5jKSkKICAgICAgICAgICA7OyBwb2ludCBpcyBpbnNpZGUgYSBi bG9jawogICAgICAgICAgIChnb3RvLWNoYXIgKG1hdGNoLWVuZCAwKSkpKSkKICAgICAoZW5kLW9m LWxpbmUpCkBAIC03OTAsMTAgKzg0Nyw4IEBAIGhzLWhpZGUtYWxsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGhzLWMtc3RhcnQtcmVnZXhwCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJcXCkiKQogICAgICAgICAgICAgICAgICAgICAgICAgICIiKSkpKQot ICAgICAgICh3aGlsZSAocHJvZ24KLSAgICAgICAgICAgICAgICAodW5sZXNzIGhzLWhpZGUtY29t bWVudHMtd2hlbi1oaWRpbmctYWxsCi0gICAgICAgICAgICAgICAgICAoZm9yd2FyZC1jb21tZW50 IChwb2ludC1tYXgpKSkKLSAgICAgICAgICAgICAgICAocmUtc2VhcmNoLWZvcndhcmQgcmUgKHBv aW50LW1heCkgdCkpCisgICAgICAgKHdoaWxlIChmdW5jYWxsIGhzLWZpbmQtbmV4dC1ibG9jay1m dW5jIHJlIChwb2ludC1tYXgpCisgICAgICAgICAgICAgICAgICAgICAgIGhzLWhpZGUtY29tbWVu dHMtd2hlbi1oaWRpbmctYWxsKQogICAgICAgICAgKGlmIChtYXRjaC1iZWdpbm5pbmcgMSkKICAg ICAgICAgICAgICA7OyBXZSBoYXZlIGZvdW5kIGEgYmxvY2sgYmVnaW5uaW5nLgogICAgICAgICAg ICAgIChwcm9nbgpAQCAtODM4LDggKzg5Myw4IEBAIGhzLWhpZGUtYmxvY2sKICAgICAgICAgICAg ICAgICAgICAgICAoPD0gKGNvdW50LWxpbmVzIChjYXIgYy1yZWcpIChudGggMSBjLXJlZykpIDEp KSkKICAgICAgICAobWVzc2FnZSAiKG5vdCBlbm91Z2ggY29tbWVudCBsaW5lcyB0byBoaWRlKSIp KQogICAgICAgKChvciBjLXJlZwotCSAgIChocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXApCi0g ICAgICAgICAgIChocy1maW5kLWJsb2NrLWJlZ2lubmluZykpCisJICAgKGZ1bmNhbGwgaHMtbG9v a2luZy1hdC1ibG9jay1zdGFydC1wLWZ1bmMpCisgICAgICAgICAgIChmdW5jYWxsIGhzLWZpbmQt YmxvY2stYmVnaW5uaW5nLWZ1bmMpKQogICAgICAgIChocy1oaWRlLWJsb2NrLWF0LXBvaW50IGVu ZCBjLXJlZykKICAgICAgICAocnVuLWhvb2tzICdocy1oaWRlLWhvb2spKSkpKSkKIApAQCAtODY4 LDkgKzkyMyw5IEBAIGhzLXNob3ctYmxvY2sKICAgICAgICAgICAgICAod2hlbiAoY2FyIGMtcmVn KQogICAgICAgICAgICAgICAgKHNldHEgcCAoY2FyIGMtcmVnKQogICAgICAgICAgICAgICAgICAg ICAgcSAoY2FkciBjLXJlZykpKSkKLSAgICAgICAgICAgICgoYW5kIChocy1maW5kLWJsb2NrLWJl Z2lubmluZykKKyAgICAgICAgICAgICgoYW5kIChmdW5jYWxsIGhzLWZpbmQtYmxvY2stYmVnaW5u aW5nLWZ1bmMpCiAgICAgICAgICAgICAgICAgICA7OyB1Z2gsIGZyZXNoIG1hdGNoLWRhdGEKLSAg ICAgICAgICAgICAgICAgIChocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXApKQorICAgICAgICAg ICAgICAgICAgKGZ1bmNhbGwgaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wLWZ1bmMpKQogICAg ICAgICAgICAgIChzZXRxIHAgKHBvaW50KQogICAgICAgICAgICAgICAgICAgIHEgKHByb2duICho cy1mb3J3YXJkLXNleHAgKG1hdGNoLWRhdGEgdCkgMSkgKHBvaW50KSkpKSkKICAgICAgICh3aGVu IChhbmQgcCBxKQpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL3Byb2dtb2Rlcy9oaWRlc2hvdy10ZXN0 cy5lbCBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvaGlkZXNob3ctdGVzdHMuZWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uZWUyYTBjN2M0YwotLS0gL2Rldi9udWxsCisrKyBi L3Rlc3QvbGlzcC9wcm9nbW9kZXMvaGlkZXNob3ctdGVzdHMuZWwKQEAgLTAsMCArMSwyNjggQEAK Kzs7OyBoaWRlc2hvdy10ZXN0cy5lbCAtLS0gVGVzdCBzdWl0ZSBmb3IgaGlkZXNob3cuZWwgIC0q LSBsZXhpY2FsLWJpbmRpbmc6dCAtKi0KKworOzsgQ29weXJpZ2h0IChDKSAyMDIyIEZyZWUgU29m dHdhcmUgRm91bmRhdGlvbiwgSW5jLgorCis7OyBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgRW1h Y3MuCisKKzs7IEdOVSBFbWFjcyBpcyBmcmVlIHNvZnR3YXJlOiB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IgbW9kaWZ5Cis7OyBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5l cmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzsgdGhlIEZyZWUgU29mdHdhcmUg Rm91bmRhdGlvbiwgZWl0aGVyIHZlcnNpb24gMyBvZiB0aGUgTGljZW5zZSwgb3IKKzs7IChhdCB5 b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisKKzs7IEdOVSBFbWFjcyBpcyBkaXN0cmli dXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorOzsgYnV0IFdJVEhPVVQg QU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKzs7IE1F UkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0 aGUKKzs7IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisKKzs7 IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1Ymxp YyBMaWNlbnNlCis7OyBhbG9uZyB3aXRoIEdOVSBFbWFjcy4gIElmIG5vdCwgc2VlIDxodHRwczov L3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCisKKzs7OyBDb21tZW50YXJ5OgorCis7OzsgQ29kZToK KworKHJlcXVpcmUgJ2VydCkKKyhyZXF1aXJlICdlcnQteCkKKyhyZXF1aXJlICdoaWRlc2hvdykK KworOzsgRGVwZW5kZW5jaWVzIGZvciB0ZXN0aW5nOgorKHJlcXVpcmUgJ2NjLW1vZGUpCisKKwor KGRlZm1hY3JvIGhpZGVzaG93LXRlc3RzLXdpdGgtdGVtcC1idWZmZXIgKG1vZGUgY29udGVudHMg JnJlc3QgYm9keSkKKyAgIkNyZWF0ZSBhIGBocy1taW5vci1tb2RlJyBlbmFibGVkIE1PREUgdGVt cCBidWZmZXIgd2l0aCBDT05URU5UUy4KK0JPRFkgaXMgY29kZSB0byBiZSBleGVjdXRlZCB3aXRo aW4gdGhlIHRlbXAgYnVmZmVyLiAgUG9pbnQgaXMKK2Fsd2F5cyBsb2NhdGVkIGF0IHRoZSBiZWdp bm5pbmcgb2YgYnVmZmVyLiIKKyAgKGRlY2xhcmUgKGluZGVudCAxKSAoZGVidWcgdCkpCisgIGAo d2l0aC10ZW1wLWJ1ZmZlcgorICAgICAoLG1vZGUpCisgICAgIChocy1taW5vci1tb2RlIDEpCisg ICAgIChpbnNlcnQgLGNvbnRlbnRzKQorICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQorICAg ICAsQGJvZHkpKQorCisoZGVmdW4gaGlkZXNob3ctdGVzdHMtbG9vay1hdCAoc3RyaW5nICZvcHRp b25hbCBudW0gcmVzdG9yZS1wb2ludCkKKyAgIk1vdmUgcG9pbnQgYXQgYmVnaW5uaW5nIG9mIFNU UklORyBpbiB0aGUgY3VycmVudCBidWZmZXIuCitPcHRpb25hbCBhcmd1bWVudCBOVU0gZGVmYXVs dHMgdG8gMSBhbmQgaXMgYW4gaW50ZWdlciBpbmRpY2F0aW5nCitob3cgbWFueSBvY2N1cnJlbmNl cyBtdXN0IGJlIGZvdW5kLCB3aGVuIHBvc2l0aXZlIHRoZSBzZWFyY2ggaXMKK2RvbmUgZm9yd2Fy ZHMsIG90aGVyd2lzZSBiYWNrd2FyZHMuICBXaGVuIFJFU1RPUkUtUE9JTlQgaXMKK25vbi1uaWwg dGhlIHBvaW50IGlzIG5vdCBtb3ZlZCBidXQgdGhlIHBvc2l0aW9uIGZvdW5kIGlzIHN0aWxsCity ZXR1cm5lZC4gIFdoZW4gc2VhcmNoaW5nIGZvcndhcmQgYW5kIHBvaW50IGlzIGFscmVhZHkgbG9v a2luZyBhdAorU1RSSU5HLCBpdCBpcyBza2lwcGVkIHNvIHRoZSBuZXh0IFNUUklORyBvY2N1cnJl bmNlIGlzIHNlbGVjdGVkLiIKKyAgKGxldCogKChudW0gKG9yIG51bSAxKSkKKyAgICAgICAgIChz dGFydGluZy1wb2ludCAocG9pbnQpKQorICAgICAgICAgKHN0cmluZyAocmVnZXhwLXF1b3RlIHN0 cmluZykpCisgICAgICAgICAoc2VhcmNoLWZuIChpZiAoPiBudW0gMCkgIydyZS1zZWFyY2gtZm9y d2FyZCAjJ3JlLXNlYXJjaC1iYWNrd2FyZCkpCisgICAgICAgICAoZGVpbmMtZm4gKGlmICg+IG51 bSAwKSAjJzEtICMnMSspKQorICAgICAgICAgKGZvdW5kLXBvaW50KSkKKyAgICAocHJvZzIKKyAg ICAgICAgKGNhdGNoICdleGl0CisgICAgICAgICAgKHdoaWxlIChub3QgKD0gbnVtIDApKQorICAg ICAgICAgICAgKHdoZW4gKGFuZCAoPiBudW0gMCkKKyAgICAgICAgICAgICAgICAgICAgICAgKGxv b2tpbmctYXQgc3RyaW5nKSkKKyAgICAgICAgICAgICAgOzsgTW92aW5nIGZvcndhcmQgYW5kIGFs cmVhZHkgbG9va2luZyBhdCBTVFJJTkcsIHNraXAgaXQuCisgICAgICAgICAgICAgIChmb3J3YXJk LWNoYXIgKGxlbmd0aCAobWF0Y2gtc3RyaW5nLW5vLXByb3BlcnRpZXMgMCkpKSkKKyAgICAgICAg ICAgIChhbmQgKG5vdCAoZnVuY2FsbCBzZWFyY2gtZm4gc3RyaW5nIG5pbCB0KSkKKyAgICAgICAg ICAgICAgICAgKHRocm93ICdleGl0IHQpKQorICAgICAgICAgICAgKHdoZW4gKD4gbnVtIDApCisg ICAgICAgICAgICAgIDs7IGByZS1zZWFyY2gtZm9yd2FyZCcgbGVhdmVzIHBvaW50IGF0IHRoZSBl bmQgb2YgdGhlCisgICAgICAgICAgICAgIDs7IG9jY3VycmVuY2UsIG1vdmUgYmFjayBzbyBwb2lu dCBpcyBhdCB0aGUgYmVnaW5uaW5nCisgICAgICAgICAgICAgIDs7IGluc3RlYWQuCisgICAgICAg ICAgICAgIChmb3J3YXJkLWNoYXIgKC0gKGxlbmd0aCAobWF0Y2gtc3RyaW5nLW5vLXByb3BlcnRp ZXMgMCkpKSkpCisgICAgICAgICAgICAoc2V0cQorICAgICAgICAgICAgIG51bSAoZnVuY2FsbCBk ZWluYy1mbiBudW0pCisgICAgICAgICAgICAgZm91bmQtcG9pbnQgKHBvaW50KSkpKQorICAgICAg ICBmb3VuZC1wb2ludAorICAgICAgKGFuZCByZXN0b3JlLXBvaW50IChnb3RvLWNoYXIgc3RhcnRp bmctcG9pbnQpKSkpKQorCisoZGVmdW4gaGlkZXNob3ctdGVzdHMtdmlzaWJsZS1zdHJpbmcgKCZv cHRpb25hbCBtaW4gbWF4KQorICAiUmV0dXJuIHRoZSBidWZmZXIgc3RyaW5nIGV4Y2x1ZGluZyBp bnZpc2libGUgb3ZlcmxheXMuCitBcmd1bWVudCBNSU4gYW5kIE1BWCBkZWxpbWl0IHRoZSByZWdp b24gdG8gYmUgcmV0dXJuZWQgYW5kCitkZWZhdWx0IHRvIGBwb2ludC1taW4nIGFuZCBgcG9pbnQt bWF4JyByZXNwZWN0aXZlbHkuIgorICAobGV0KiAoKG1pbiAob3IgbWluIChwb2ludC1taW4pKSkK KyAgICAgICAgIChtYXggKG9yIG1heCAocG9pbnQtbWF4KSkpCisgICAgICAgICAoYnVmZmVyLWNv bnRlbnRzIChidWZmZXItc3Vic3RyaW5nLW5vLXByb3BlcnRpZXMgbWluIG1heCkpCisgICAgICAg ICAob3ZlcmxheXMKKyAgICAgICAgICAoc29ydCAob3ZlcmxheXMtaW4gbWluIG1heCkKKyAgICAg ICAgICAgICAgICAobGFtYmRhIChhIGIpCisgICAgICAgICAgICAgICAgICAobGV0ICgob3Zlcmxh eS1lbmQtYSAob3ZlcmxheS1lbmQgYSkpCisgICAgICAgICAgICAgICAgICAgICAgICAob3Zlcmxh eS1lbmQtYiAob3ZlcmxheS1lbmQgYikpKQorICAgICAgICAgICAgICAgICAgICAoPiBvdmVybGF5 LWVuZC1hIG92ZXJsYXktZW5kLWIpKSkpKSkKKyAgICAod2l0aC10ZW1wLWJ1ZmZlcgorICAgICAg KGluc2VydCBidWZmZXItY29udGVudHMpCisgICAgICAoZG9saXN0IChvdmVybGF5IG92ZXJsYXlz KQorICAgICAgICAoaWYgKG92ZXJsYXktZ2V0IG92ZXJsYXkgJ2ludmlzaWJsZSkKKyAgICAgICAg ICAgIChkZWxldGUtcmVnaW9uIChvdmVybGF5LXN0YXJ0IG92ZXJsYXkpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAob3ZlcmxheS1lbmQgb3ZlcmxheSkpKSkKKyAgICAgIChidWZmZXItc3Vi c3RyaW5nLW5vLXByb3BlcnRpZXMgKHBvaW50LW1pbikgKHBvaW50LW1heCkpKSkpCisKKyhlcnQt ZGVmdGVzdCBoaWRlc2hvdy1oaWRlLWJsb2NrLTEgKCkKKyAgIlNob3VsZCBoaWRlIGN1cnJlbnQg YmxvY2suIgorICAobGV0ICgoY29udGVudHMgIgoraW50CittYWluKCkKK3sKKyAgcHJpbnRmKFwi SGVsbG9cXG5cIik7Cit9CisiKSkKKyAgICAoaGlkZXNob3ctdGVzdHMtd2l0aC10ZW1wLWJ1ZmZl cgorICAgICBjLW1vZGUKKyAgICAgY29udGVudHMKKyAgICAgKGhpZGVzaG93LXRlc3RzLWxvb2st YXQgInByaW50ZiIpCisgICAgIChocy1oaWRlLWJsb2NrKQorICAgICAoc2hvdWxkIChzdHJpbmc9 CisgICAgICAgICAgICAgIChoaWRlc2hvdy10ZXN0cy12aXNpYmxlLXN0cmluZykKKyAgICAgICAg ICAgICAgIgoraW50CittYWluKCkKK3t9CisiKSkKKyAgICAgKGhzLXNob3ctYmxvY2spCisgICAg IChzaG91bGQgKHN0cmluZz0gKGhpZGVzaG93LXRlc3RzLXZpc2libGUtc3RyaW5nKSBjb250ZW50 cykpKSkpCisKKyhlcnQtZGVmdGVzdCBoaWRlc2hvdy1oaWRlLWFsbC0xICgpCisgICJTaG91bGQg aGlkZSBhbGwgYmxvY2tzIGFuZCBjb21tZW50cy4iCisgIChsZXQgKChjb250ZW50cyAiCisvKgor ICAgQ29tbWVudHMKKyovCisKK2ludAorbWFpbigpCit7CisgIHN1YigpOworfQorCit2b2lkCitz dWIoKQoreworICBwcmludGYoXCJIZWxsb1xcblwiKTsKK30KKyIpKQorICAgIChoaWRlc2hvdy10 ZXN0cy13aXRoLXRlbXAtYnVmZmVyCisgICAgIGMtbW9kZQorICAgICBjb250ZW50cworICAgICAo aHMtaGlkZS1hbGwpCisgICAgIChzaG91bGQgKHN0cmluZz0KKyAgICAgICAgICAgICAgKGhpZGVz aG93LXRlc3RzLXZpc2libGUtc3RyaW5nKQorICAgICAgICAgICAgICAiCisvKgorCitpbnQKK21h aW4oKQore30KKwordm9pZAorc3ViKCkKK3t9CisiKSkKKyAgICAgKGhzLXNob3ctYWxsKQorICAg ICAoc2hvdWxkIChzdHJpbmc9IChoaWRlc2hvdy10ZXN0cy12aXNpYmxlLXN0cmluZykgY29udGVu dHMpKSkpKQorCisoZXJ0LWRlZnRlc3QgaGlkZXNob3ctaGlkZS1hbGwtMiAoKQorICAiU2hvdWxk IG5vdCBoaWRlIGNvbW1lbnRzIHdoZW4gYGhzLWhpZGUtY29tbWVudHMtd2hlbi1oaWRpbmctYWxs JyBpcyBuaWwuIgorICAobGV0ICgoY29udGVudHMgIgorLyoKKyAgIENvbW1lbnRzCisqLworCitp bnQKK21haW4oKQoreworICBzdWIoKTsKK30KKwordm9pZAorc3ViKCkKK3sKKyAgcHJpbnRmKFwi SGVsbG9cXG5cIik7Cit9CisiKSkKKyAgICAoaGlkZXNob3ctdGVzdHMtd2l0aC10ZW1wLWJ1ZmZl cgorICAgICBjLW1vZGUKKyAgICAgY29udGVudHMKKyAgICAgKGxldCAoKGhzLWhpZGUtY29tbWVu dHMtd2hlbi1oaWRpbmctYWxsIG5pbCkpCisgICAgICAgKGhzLWhpZGUtYWxsKSkKKyAgICAgKHNo b3VsZCAoc3RyaW5nPQorICAgICAgICAgICAgICAoaGlkZXNob3ctdGVzdHMtdmlzaWJsZS1zdHJp bmcpCisgICAgICAgICAgICAgICIKKy8qCisgICBDb21tZW50cworKi8KKworaW50CittYWluKCkK K3t9CisKK3ZvaWQKK3N1YigpCit7fQorIikpCisgICAgIChocy1zaG93LWFsbCkKKyAgICAgKHNo b3VsZCAoc3RyaW5nPSAoaGlkZXNob3ctdGVzdHMtdmlzaWJsZS1zdHJpbmcpIGNvbnRlbnRzKSkp KSkKKworKGVydC1kZWZ0ZXN0IGhpZGVzaG93LWhpZGUtbGV2ZWwtMSAoKQorICAiU2hvdWxkIGhp ZGUgMXN0IGxldmVsIGJsb2Nrcy4iCisgIChoaWRlc2hvdy10ZXN0cy13aXRoLXRlbXAtYnVmZmVy CisgICBjLW1vZGUKKyAgICIKKy8qCisgICBDb21tZW50cworKi8KKworaW50CittYWluKGludCBh cmdjLCBjaGFyICoqYXJndikKK3sKKyAgaWYgKGFyZ2MgPiAxKSB7CisgICAgcHJpbnRmKFwiSGVs bG9cXG5cIik7CisgIH0KK30KKyIKKyAgIChocy1oaWRlLWxldmVsIDEpCisgICAoc2hvdWxkIChz dHJpbmc9CisgICAgICAgICAgICAoaGlkZXNob3ctdGVzdHMtdmlzaWJsZS1zdHJpbmcpCisgICAg ICAgICAgICAiCisvKgorICAgQ29tbWVudHMKKyovCisKK2ludAorbWFpbihpbnQgYXJnYywgY2hh ciAqKmFyZ3YpCit7fQorIikpKSkKKworKGVydC1kZWZ0ZXN0IGhpZGVzaG93LWhpZGUtbGV2ZWwt MiAoKQorICAiU2hvdWxkIGhpZGUgMm5kIGxldmVsIGJsb2Nrcy4iCisgIChoaWRlc2hvdy10ZXN0 cy13aXRoLXRlbXAtYnVmZmVyCisgICBjLW1vZGUKKyAgICIKKy8qCisgICBDb21tZW50cworKi8K KworaW50CittYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKK3sKKyAgaWYgKGFyZ2MgPiAxKSB7 CisgICAgcHJpbnRmKFwiSGVsbG9cXG5cIik7CisgIH0KK30KKyIKKyAgIChocy1oaWRlLWxldmVs IDIpCisgICAoc2hvdWxkIChzdHJpbmc9CisgICAgICAgICAgICAoaGlkZXNob3ctdGVzdHMtdmlz aWJsZS1zdHJpbmcpCisgICAgICAgICAgICAiCisvKgorICAgQ29tbWVudHMKKyovCisKK2ludAor bWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCit7CisgIGlmIChhcmdjID4gMSkge30KK30KKyIp KSkpCisKKyhwcm92aWRlICdoaWRlc2hvdy10ZXN0cykKKworOzs7IGhpZGVzaG93LXRlc3RzLmVs IGVuZHMgaGVyZQo= --0000000000005bbc8a05e61ea8c1 Content-Type: application/octet-stream; name="fix-56635-python.patch" Content-Disposition: attachment; filename="fix-56635-python.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6rvowvd1 Y29tbWl0IGViM2U5ZDE4NzBlZWNiMmY2NmQ0NzUyNGE4MjVjZDNhMjhjOWJkZGUKQXV0aG9yOiBr b2Jhcml0eSA8a29iYXJpdHlAZ21haWwuY29tPgpEYXRlOiAgIFNhdCBBdWcgMTMgMjA6MzM6NDYg MjAyMiArMDkwMAoKICAgIEFkZCBQeXRob24gYmxvY2tzIHN1cHBvcnQgZm9yIGhpZGVzaG93CiAg ICAKICAgICogbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsIChweXRob24tbmF2LWJlZ2lubmluZy1v Zi1ibG9jay1yZWdleHApOgogICAgTmV3IHZhcmlhYmxlLgogICAgKHB5dGhvbi1oaWRlc2hvdy1m b3J3YXJkLXNleHAtZnVuY3Rpb24pOiBDaGFuZ2UgdG8gY2FsbAogICAgYHB5dGhvbi1uYXYtZW5k LW9mLWJsb2NrJy4KICAgIChweXRob24taGlkZXNob3ctZmluZC1uZXh0LWJsb2NrKTogTmV3IGZ1 bmN0aW9uIHRvIGJlIHVzZWQgYXMKICAgIEZJTkQtTkVYVC1CTE9DSy1GVU5DIGluIGBocy1zcGVj aWFsLW1vZGVzLWFsaXN0Jy4KICAgIChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1v Zi1ibG9jayk6IE5ldyBmdW5jdGlvbiB0byBiZQogICAgdXNlZCBhcyBMT09LSU5HLUFULUJMT0NL LVNUQVJULVAtRlVOQyBpbiBgaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdCcuCiAgICAocHl0aG9uLW1v ZGUpOiBDaGFuZ2Ugc2V0dGluZ3Mgb2YgYGhzLXNwZWNpYWwtbW9kZXMtYWxpc3QnLgogICAgCiAg ICAqIHRlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCiAgICAocHl0aG9uLWhpZGVz aG93LWhpZGUtbGV2ZWxzLTEpOiBGaXggdG8ga2VlcCBlbXB0eSBsaW5lcy4KICAgIChweXRob24t aW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jay0xKQogICAgKHB5dGhvbi1oaWRlc2hv dy1oaWRlLWxldmVscy0zLCBweXRob24taGlkZXNob3ctaGlkZS1sZXZlbHMtNCkKICAgIChweXRo b24taGlkZXNob3ctaGlkZS1hbGwtMSwgcHl0aG9uLWhpZGVzaG93LWhpZGUtYWxsLTIpCiAgICAo cHl0aG9uLWhpZGVzaG93LWhpZGUtYWxsLTMsIHB5dGhvbi1oaWRlc2hvdy1oaWRlLWJsb2NrLTEp OiBOZXcKICAgIHRlc3RzLgoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBi L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbAppbmRleCA5NmY5ZDE0ODMyLi45MzhjYTQzZTg2IDEw MDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMv cHl0aG9uLmVsCkBAIC0xNTA0LDYgKzE1MDQsMTAgQEAgcHl0aG9uLW5hdi1iZWdpbm5pbmctb2Yt ZGVmdW4tcmVnZXhwCiBUaGUgbmFtZSBvZiB0aGUgZGVmdW4gc2hvdWxkIGJlIGdyb3VwZWQgc28g aXQgY2FuIGJlIHJldHJpZXZlZAogdmlhIGBtYXRjaC1zdHJpbmcnLiIpCiAKKyhkZWZ2YXIgcHl0 aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2stcmVnZXhwCisgIChweXRob24tcnggbGluZS1zdGFy dCAoKiBzcGFjZSkgYmxvY2stc3RhcnQpCisgICJSZWdleHAgbWF0Y2hpbmcgYmxvY2sgc3RhcnQu IikKKwogKGRlZnVuIHB5dGhvbi1uYXYtLWJlZ2lubmluZy1vZi1kZWZ1biAoJm9wdGlvbmFsIGFy ZykKICAgIkludGVybmFsIGltcGxlbWVudGF0aW9uIG9mIGBweXRob24tbmF2LWJlZ2lubmluZy1v Zi1kZWZ1bicuCiBXaXRoIHBvc2l0aXZlIEFSRyBzZWFyY2ggYmFja3dhcmRzLCBlbHNlIHNlYXJj aCBmb3J3YXJkcy4iCkBAIC00ODg1LDkgKzQ4ODksMzIgQEAgcHl0aG9uLWRlc2NyaWJlLWF0LXBv aW50CiAoZGVmdW4gcHl0aG9uLWhpZGVzaG93LWZvcndhcmQtc2V4cC1mdW5jdGlvbiAoX2FyZykK ICAgIlB5dGhvbiBzcGVjaWZpYyBgZm9yd2FyZC1zZXhwJyBmdW5jdGlvbiBmb3IgYGhzLW1pbm9y LW1vZGUnLgogQXJndW1lbnQgQVJHIGlzIGlnbm9yZWQuIgotICAocHl0aG9uLW5hdi1lbmQtb2Yt ZGVmdW4pCi0gICh1bmxlc3MgKHB5dGhvbi1pbmZvLWN1cnJlbnQtbGluZS1lbXB0eS1wKQotICAg IChiYWNrd2FyZC1jaGFyKSkpCisgIChweXRob24tbmF2LWVuZC1vZi1ibG9jaykpCisKKyhkZWZ1 biBweXRob24taGlkZXNob3ctZmluZC1uZXh0LWJsb2NrIChyZWdleHAgbWF4cCBjb21tZW50cykK KyAgIlB5dGhvbiBzcGVjaWZpYyBgaHMtZmluZC1uZXh0LWJsb2NrJyBmdW5jdGlvbiBmb3IgYGhz LW1pbm9yLW1vZGUnLgorQ2FsbCBgcHl0aG9uLW5hdi1mb3J3YXJkLWJsb2NrJyB0byBmaW5kIG5l eHQgYmxvY2sgYW5kIGNoZWNrIGlmCitibG9jay1zdGFydCBlbmRzIHdpdGhpbiBNQVhQLiAgSWYg Q09NTUVOVFMgaXMgbm90IG5pbCwgY29tbWVudHMKK2FyZSBhbHNvIHNlYXJjaGVkLiAgUkVHRVhQ IGlzIHBhc3NlZCB0byBgbG9va2luZy1hdCcgdG8gc2V0CitgbWF0Y2gtZGF0YScuIgorICAobGV0 KiAoKG5leHQtYmxvY2sgKG9yIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgKGFuZCAocHl0aG9uLW5hdi1mb3J3YXJkLWJsb2NrKQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAocmUtc2VhcmNoLWZvcndhcmQKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChweXRob24tcnggYmxvY2stc3RhcnQpIG1heHAgdCkpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICgxKyBtYXhwKSkpCisgICAgICAgICAobmV4dC1jb21tZW50CisgICAgICAg ICAgKG9yICh3aGVuIGNvbW1lbnRzCisgICAgICAgICAgICAgICAgKHNhdmUtZXhjdXJzaW9uCisg ICAgICAgICAgICAgICAgICAoY2wtbG9vcCB3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQgIiMiIG1h eHAgdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChweXRob24tc3ludGF4LWNvbnRl eHQgJ2NvbW1lbnQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gKHBvaW50KSkp KQorICAgICAgICAgICAgICAoMSsgbWF4cCkpKQorICAgICAgICAgKG5leHQtYmxvY2stb3ItY29t bWVudCAobWluIG5leHQtYmxvY2sgbmV4dC1jb21tZW50KSkpCisgICAgKHdoZW4gKDw9IG5leHQt YmxvY2stb3ItY29tbWVudCBtYXhwKQorICAgICAgKGdvdG8tY2hhciBuZXh0LWJsb2NrLW9yLWNv bW1lbnQpCisgICAgICAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgKGJlZ2lubmluZy1vZi1saW5l KQorICAgICAgICAobG9va2luZy1hdCByZWdleHApKSkpKQogCiAMCiA7OzsgSW1lbnUKQEAgLTUz ODQsNiArNTQxMSwxOSBAQCBweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1kZWZ1 bgogICAgICAgICAgKGJlZ2lubmluZy1vZi1saW5lIDEpCiAgICAgICAgICAobG9va2luZy1hdCBw eXRob24tbmF2LWJlZ2lubmluZy1vZi1kZWZ1bi1yZWdleHApKSkpCiAKKyhkZWZ1biBweXRob24t aW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jayAoKQorICAiQ2hlY2sgaWYgcG9pbnQg aXMgYXQgdGhlIGJlZ2lubmluZyBvZiBibG9jay4iCisgIChsZXQqICgobGluZS1iZWctcG9zIChs aW5lLWJlZ2lubmluZy1wb3NpdGlvbikpCisgICAgICAgICAobGluZS1jb250ZW50LXN0YXJ0ICgr IGxpbmUtYmVnLXBvcyAoY3VycmVudC1pbmRlbnRhdGlvbikpKQorICAgICAgICAgKGJsb2NrLWJl Zy1wb3MgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgIChweXRob24t bmF2LWJlZ2lubmluZy1vZi1ibG9jaykpKSkKKyAgICAoYW5kIGJsb2NrLWJlZy1wb3MKKyAgICAg ICAgICg9IGJsb2NrLWJlZy1wb3MgbGluZS1jb250ZW50LXN0YXJ0KQorICAgICAgICAgKDw9IChw b2ludCkgbGluZS1jb250ZW50LXN0YXJ0KQorICAgICAgICAgKHNhdmUtZXhjdXJzaW9uCisgICAg ICAgICAgIChiZWdpbm5pbmctb2YtbGluZSkKKyAgICAgICAgICAgKGxvb2tpbmctYXQgcHl0aG9u LW5hdi1iZWdpbm5pbmctb2YtYmxvY2stcmVnZXhwKSkpKSkKKwogKGRlZnVuIHB5dGhvbi1pbmZv LWN1cnJlbnQtbGluZS1jb21tZW50LXAgKCkKICAgIlJldHVybiBub24tbmlsIGlmIGN1cnJlbnQg bGluZSBpcyBhIGNvbW1lbnQgbGluZS4iCiAgIChjaGFyLWVxdWFsCkBAIC01ODMzLDE0ICs1ODcz LDE3IEBAIHB5dGhvbi1tb2RlCiAKICAgKGFkZC10by1saXN0CiAgICAnaHMtc3BlY2lhbC1tb2Rl cy1hbGlzdAotICAgJyhweXRob24tbW9kZQotICAgICAiXFxzLSpcXF88XFwoPzpkZWZcXHxjbGFz c1xcKVxcXz4iCisgICBgKHB5dGhvbi1tb2RlCisgICAgICxweXRob24tbmF2LWJlZ2lubmluZy1v Zi1ibG9jay1yZWdleHAKICAgICAgOzsgVXNlIHRoZSBlbXB0eSBzdHJpbmcgYXMgZW5kIHJlZ2V4 cCBzbyBpdCBkb2Vzbid0IGRlZmF1bHQgdG8KICAgICAgOzsgIlxccykiLiAgVGhpcyB3YXkgcGFy ZW5zIGF0IGVuZCBvZiBkZWZ1biBhcmUgcHJvcGVybHkgaGlkZGVuLgogICAgICAiIgogICAgICAi IyIKICAgICAgcHl0aG9uLWhpZGVzaG93LWZvcndhcmQtc2V4cC1mdW5jdGlvbgotICAgICBuaWwp KQorICAgICBuaWwKKyAgICAgcHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2sKKyAgICAgcHl0 aG9uLWhpZGVzaG93LWZpbmQtbmV4dC1ibG9jaworICAgICBweXRob24taW5mby1sb29raW5nLWF0 LWJlZ2lubmluZy1vZi1ibG9jaykpCiAKICAgKHNldHEtbG9jYWwgb3V0bGluZS1yZWdleHAgKHB5 dGhvbi1yeCAoKiBzcGFjZSkgYmxvY2stc3RhcnQpKQogICAoc2V0cS1sb2NhbCBvdXRsaW5lLWhl YWRpbmctZW5kLXJlZ2V4cCAiOlteXG5dKlxuIikKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9wcm9n bW9kZXMvcHl0aG9uLXRlc3RzLmVsIGIvdGVzdC9saXNwL3Byb2dtb2Rlcy9weXRob24tdGVzdHMu ZWwKaW5kZXggZDMwMzA1MGZhZC4uMmZhOTFkYzc5YiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL3By b2dtb2Rlcy9weXRob24tdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL3Byb2dtb2Rlcy9weXRob24t dGVzdHMuZWwKQEAgLTU1ODIsNiArNTU4MiwzOSBAQCBweXRob24taW5mby1sb29raW5nLWF0LWJl Z2lubmluZy1vZi1kZWZ1bi0yCiAgICAoc2hvdWxkIChub3QgKHB5dGhvbi1pbmZvLWxvb2tpbmct YXQtYmVnaW5uaW5nLW9mLWRlZnVuKSkpCiAgICAoc2hvdWxkIChub3QgKHB5dGhvbi1pbmZvLWxv b2tpbmctYXQtYmVnaW5uaW5nLW9mLWRlZnVuIG5pbCB0KSkpKSkKIAorKGVydC1kZWZ0ZXN0IHB5 dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrLTEgKCkKKyAgKHB5dGhvbi10 ZXN0cy13aXRoLXRlbXAtYnVmZmVyCisgICAiCitkZWYgZigpOgorICAgIGlmIFRydWU6CisgICAg ICAgIHBhc3MKKyAgICBsID0gW3ggKiAyCisgICAgICAgICBmb3IgeCBpbiByYW5nZSg1KQorICAg ICAgICAgaWYgeCA8IDNdCisjIGlmIEZhbHNlOgorXCJcIlwiCitpZiAwOgorXCJcIlwiCisiCisg ICAocHl0aG9uLXRlc3RzLWxvb2stYXQgImRlZiBmKCk6IikKKyAgIChzaG91bGQgKHB5dGhvbi1p bmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrKSkKKyAgIChmb3J3YXJkLWNoYXIpCisg ICAoc2hvdWxkIChub3QgKHB5dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2Nr KSkpCisgICAocHl0aG9uLXRlc3RzLWxvb2stYXQgImlmIFRydWU6IikKKyAgIChzaG91bGQgKHB5 dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrKSkKKyAgIChmb3J3YXJkLWNo YXIpCisgICAoc2hvdWxkIChub3QgKHB5dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9m LWJsb2NrKSkpCisgICAoYmVnaW5uaW5nLW9mLWxpbmUpCisgICAoc2hvdWxkIChweXRob24taW5m by1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jaykpCisgICAocHl0aG9uLXRlc3RzLWxvb2st YXQgImZvciB4IikKKyAgIChzaG91bGQgKG5vdCAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdp bm5pbmctb2YtYmxvY2spKSkKKyAgIChweXRob24tdGVzdHMtbG9vay1hdCAiaWYgeCA8IDMiKQor ICAgKHNob3VsZCAobm90IChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9j aykpKQorICAgKHB5dGhvbi10ZXN0cy1sb29rLWF0ICJpZiBGYWxzZToiKQorICAgKHNob3VsZCAo bm90IChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jaykpKQorICAgKHB5 dGhvbi10ZXN0cy1sb29rLWF0ICJpZiAwOiIpCisgICAoc2hvdWxkIChub3QgKHB5dGhvbi1pbmZv LWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrKSkpKSkKKwogKGVydC1kZWZ0ZXN0IHB5dGhv bi1pbmZvLWN1cnJlbnQtbGluZS1jb21tZW50LXAtMSAoKQogICAocHl0aG9uLXRlc3RzLXdpdGgt dGVtcC1idWZmZXIKICAgICIKQEAgLTYwMzUsOCArNjA2OCwxMSBAQCBweXRob24taGlkZXNob3ct aGlkZS1sZXZlbHMtMQogY2xhc3MgU29tZUNsYXNzOgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYs IGFyZywga3dhcmc9MSk6CisKICAgICBkZWYgZmlsdGVyKHNlbGYsIG51bXMpOgotICAgIGRlZiBf X3N0cl9fKHNlbGYpOiIpKSkpCisKKyAgICBkZWYgX19zdHJfXyhzZWxmKToKKyIpKSkpCiAgICAg ICAob3IgZW5hYmxlZCAoaHMtbWlub3ItbW9kZSAtMSkpKSkpCiAKIChlcnQtZGVmdGVzdCBweXRo b24taGlkZXNob3ctaGlkZS1sZXZlbHMtMiAoKQpAQCAtNjA4Miw2ICs2MTE4LDE1NiBAQCBweXRo b24taGlkZXNob3ctaGlkZS1sZXZlbHMtMgogIikpKSkKICAgICAgIChvciBlbmFibGVkIChocy1t aW5vci1tb2RlIC0xKSkpKSkKIAorKGVydC1kZWZ0ZXN0IHB5dGhvbi1oaWRlc2hvdy1oaWRlLWxl dmVscy0zICgpCisgICJTaG91bGQgaGlkZSBhbGwgYmxvY2tzLiIKKyAgKHB5dGhvbi10ZXN0cy13 aXRoLXRlbXAtYnVmZmVyCisgICAiCitkZWYgZigpOgorICAgIGlmIDA6CisgICAgICAgIGwgPSBb aSBmb3IgaSBpbiByYW5nZSg1KQorICAgICAgICAgICAgIGlmIGkgPCAzXQorICAgICAgICBhYmMg PSBvLm1hdGNoKDEsIDIsIDMpCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKGhzLWhpZGUt bGV2ZWwgMSkKKyAgIChzaG91bGQKKyAgICAoc3RyaW5nPQorICAgICAocHl0aG9uLXRlc3RzLXZp c2libGUtc3RyaW5nKQorICAgICAiCitkZWYgZigpOgorIikpKSkKKworKGVydC1kZWZ0ZXN0IHB5 dGhvbi1oaWRlc2hvdy1oaWRlLWxldmVscy00ICgpCisgICJTaG91bGQgaGlkZSAybmQgbGV2ZWwg YmxvY2suIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZmZXIKKyAgICIKK2RlZiBmKCk6 CisgICAgaWYgMDoKKyAgICAgICAgbCA9IFtpIGZvciBpIGluIHJhbmdlKDUpCisgICAgICAgICAg ICAgaWYgaSA8IDNdCisgICAgICAgIGFiYyA9IG8ubWF0Y2goMSwgMiwgMykKKyIKKyAgIChocy1t aW5vci1tb2RlIDEpCisgICAoaHMtaGlkZS1sZXZlbCAyKQorICAgKHNob3VsZAorICAgIChzdHJp bmc9CisgICAgIChweXRob24tdGVzdHMtdmlzaWJsZS1zdHJpbmcpCisgICAgICIKK2RlZiBmKCk6 CisgICAgaWYgMDoKKyIpKSkpCisKKyhlcnQtZGVmdGVzdCBweXRob24taGlkZXNob3ctaGlkZS1h bGwtMSAoKQorICAiU2hvdWxkIGhpZGUgYWxsIGJsb2Nrcy4iCisgIChweXRob24tdGVzdHMtd2l0 aC10ZW1wLWJ1ZmZlcgorICAgIgoraWYgMDoKKworICAgIGFhYQorICAgIGwgPSBbaSBmb3IgaSBp biByYW5nZSg1KQorICAgICAgICAgaWYgaSA8IDNdCisgICAgY2NjCisgICAgYWJjID0gby5tYXRj aCgxLCAyLCAzKQorICAgIGRkZAorCitkZWYgZigpOgorICAgIHBhc3MKKyIKKyAgIChocy1taW5v ci1tb2RlIDEpCisgICAoaHMtaGlkZS1hbGwpCisgICAoc2hvdWxkCisgICAgKHN0cmluZz0KKyAg ICAgKHB5dGhvbi10ZXN0cy12aXNpYmxlLXN0cmluZykKKyAgICAgIgoraWYgMDoKKworZGVmIGYo KToKKyIpKSkpCisKKyhlcnQtZGVmdGVzdCBweXRob24taGlkZXNob3ctaGlkZS1hbGwtMiAoKQor ICAiU2hvdWxkIGhpZGUgY29tbWVudHMuIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZm ZXIKKyAgICIKKyMgTXVsdGkgbGluZQorIyBjb21tZW50CisKK1wiXCJcIgorIyBNdWx0aSBsaW5l CisjIHN0cmluZworXCJcIlwiCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKGhzLWhpZGUt YWxsKQorICAgKHNob3VsZAorICAgIChzdHJpbmc9CisgICAgIChweXRob24tdGVzdHMtdmlzaWJs ZS1zdHJpbmcpCisgICAgICIKKyMgTXVsdGkgbGluZQorCitcIlwiXCIKKyMgTXVsdGkgbGluZQor IyBzdHJpbmcKK1wiXCJcIgorIikpKSkKKworKGVydC1kZWZ0ZXN0IHB5dGhvbi1oaWRlc2hvdy1o aWRlLWFsbC0zICgpCisgICJTaG91bGQgbm90IGhpZGUgY29tbWVudHMgd2hlbiBgaHMtaGlkZS1j b21tZW50cy13aGVuLWhpZGluZy1hbGwnIGlzIG5pbC4iCisgIChweXRob24tdGVzdHMtd2l0aC10 ZW1wLWJ1ZmZlcgorICAgIgorIyBNdWx0aSBsaW5lCisjIGNvbW1lbnQKKworXCJcIlwiCisjIE11 bHRpIGxpbmUKKyMgc3RyaW5nCitcIlwiXCIKKyIKKyAgIChocy1taW5vci1tb2RlIDEpCisgICAo bGV0ICgoaHMtaGlkZS1jb21tZW50cy13aGVuLWhpZGluZy1hbGwgbmlsKSkKKyAgICAgKGhzLWhp ZGUtYWxsKSkKKyAgIChzaG91bGQKKyAgICAoc3RyaW5nPQorICAgICAocHl0aG9uLXRlc3RzLXZp c2libGUtc3RyaW5nKQorICAgICAiCisjIE11bHRpIGxpbmUKKyMgY29tbWVudAorCitcIlwiXCIK KyMgTXVsdGkgbGluZQorIyBzdHJpbmcKK1wiXCJcIgorIikpKSkKKworKGVydC1kZWZ0ZXN0IHB5 dGhvbi1oaWRlc2hvdy1oaWRlLWJsb2NrLTEgKCkKKyAgIlNob3VsZCBoaWRlIGN1cnJlbnQgYmxv Y2suIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZmZXIKKyAgICIKK2lmIDA6CisKKyAg ICBhYWEKKyAgICBsID0gW2kgZm9yIGkgaW4gcmFuZ2UoNSkKKyAgICAgICAgIGlmIGkgPCAzXQor ICAgIGNjYworICAgIGFiYyA9IG8ubWF0Y2goMSwgMiwgMykKKyAgICBkZGQKKworZGVmIGYoKToK KyAgICBwYXNzCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKHB5dGhvbi10ZXN0cy1sb29r LWF0ICJkZGQiKQorICAgKGZvcndhcmQtbGluZSkKKyAgIChocy1oaWRlLWJsb2NrKQorICAgKHNo b3VsZAorICAgIChzdHJpbmc9CisgICAgIChweXRob24tdGVzdHMtdmlzaWJsZS1zdHJpbmcpCisg ICAgICIKK2lmIDA6CisKK2RlZiBmKCk6CisgICAgcGFzcworIikpKSkKKwogCiAoZXJ0LWRlZnRl c3QgcHl0aG9uLXRlc3RzLS1weXRob24tbmF2LWVuZC1vZi1zdGF0ZW1lbnQtLWluZmxvb3AgKCkK ICAgIkNoZWNrcyB0aGF0IGBweXRob24tbmF2LWVuZC1vZi1zdGF0ZW1lbnQnIGRvZXNuJ3QgaW5m bG9vcCBpbiBhCg== --0000000000005bbc8a05e61ea8c1-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 15 11:01:14 2022 Received: (at 56635) by debbugs.gnu.org; 15 Aug 2022 15:01:14 +0000 Received: from localhost ([127.0.0.1]:43819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNbab-0006Kv-Up for submit@debbugs.gnu.org; Mon, 15 Aug 2022 11:01:14 -0400 Received: from mail-ed1-f41.google.com ([209.85.208.41]:46652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNbaW-0006Kd-5v for 56635@debbugs.gnu.org; Mon, 15 Aug 2022 11:01:12 -0400 Received: by mail-ed1-f41.google.com with SMTP id s11so9879271edd.13 for <56635@debbugs.gnu.org>; Mon, 15 Aug 2022 08:01:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc; bh=gLIuer1dOh+QdgVA2/2Et13CBIOPzCXF3gYfU3YaNiM=; b=Ks/w+lfeowO/rwrE70C7lJoWHyKTKjWxV07e6Rgn1v1yOuYh+JNgPNeCpMeX0Z5oqC RBa7WUtUcy6/WKMbTBNgV1j5+DHQM4dl9eG2WcvqAykKPaqfMvgCSzvIIwTWh/ecamJY yR0FgF6NyfWV7/04K4fVIRx0MFrzl1CDZG+qsjK9OQwom/utb1X7hF/Bi2zW+EBzcCLE c1WlSm8DVRNiPwNY3bZYD7JKtNjpoGzK4qV8b4M2k4YRt7J5jbqgxrRX51xF7ptRGb3D gvqabOZE8feeKrsEtp1hcvBHkJOaFXLXJV6T22bpNJbVisNRTtaZyE086o7mUq/tbwqG HgYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc; bh=gLIuer1dOh+QdgVA2/2Et13CBIOPzCXF3gYfU3YaNiM=; b=VHz2USYp7jqJbkLfxjHowq2WqxJpaTHQ2H1Whth1VCe0gJ03TOmGYDccFGV5Vp8b9M eg4F15x/L9N3IgkRDHwn6gTRFdkX7IpsFiCqsx5qulJopon7yBHf46aUXhcv1L1ptt65 8o69SOss8t3qBIZs5/q6yvsLyoabvzH8XIG7TUO94PlQng7DwJvyXdIBzh4H2/6wuBeJ IMW5mzH8ViAnTqNWWBthB2MZp4EuBQgf6CBmphHBNGyyca1ciw47ictPtBQD4yAKJFLi cSdwWREE5TtZxqxUVebynV34di3hvs+NE+YHWnyTvs2VjEbvtuuOB5+WW5fIdDMooBsP n2Zg== X-Gm-Message-State: ACgBeo06Cms8aGYch3cOAwe8FMwN+67IElhcr6NvsZ/lFHdC5YXldHZ8 yG78HzDtoGrkTpvx//eFcwxpyAvmXGWHc5ORsgk= X-Google-Smtp-Source: AA6agR4QaDqOVg2l++FvJeFlcPXXH370hEOA+GDZeonuBX9hPeIt/LIOivRUZwUvR0VIPmk2KEju70i4okgg05FXhn0= X-Received: by 2002:a05:6402:331d:b0:43d:9e2e:6966 with SMTP id e29-20020a056402331d00b0043d9e2e6966mr15247787eda.214.1660575662069; Mon, 15 Aug 2022 08:01:02 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> In-Reply-To: From: kobarity Date: Tue, 16 Aug 2022 00:00:48 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Augusto Stoffel , Dima Kogan , Lars Ingebrigtsen , 56635@debbugs.gnu.org Content-Type: multipart/mixed; boundary="00000000000077088405e648e645" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --00000000000077088405e648e645 Content-Type: text/plain; charset="UTF-8" I wrote: > Is there any comments on extending `hs-special-modes-alist'? Attached > are revised patches. I would like to know if it is worth extending > `hs-special-modes-alist'. I fixed some issues in the Python patch. Please note that the fix for #57223 (merged recently) is also needed for all ERTs to pass. Best Regards, --00000000000077088405e648e645 Content-Type: application/octet-stream; name="fix-56635-python.patch" Content-Disposition: attachment; filename="fix-56635-python.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l6uvoyff0 Y29tbWl0IDE3N2EzYTlmOWE1YjM5YzFjNWRmNmRjNjQxZDUyN2Q4ODAzYmMyOWUKQXV0aG9yOiBr b2Jhcml0eSA8a29iYXJpdHlAZ21haWwuY29tPgpEYXRlOiAgIE1vbiBBdWcgMTUgMjM6NDk6MzQg MjAyMiArMDkwMAoKICAgIEFkZCBQeXRob24gYmxvY2tzIHN1cHBvcnQgZm9yIGhpZGVzaG93CiAg ICAKICAgICogbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsIChweXRob24tbmF2LWJlZ2lubmluZy1v Zi1ibG9jay1yZWdleHApOgogICAgTmV3IHZhcmlhYmxlLgogICAgKHB5dGhvbi1oaWRlc2hvdy1m b3J3YXJkLXNleHAtZnVuY3Rpb24pOiBDaGFuZ2UgdG8gY2FsbAogICAgYHB5dGhvbi1uYXYtZW5k LW9mLWJsb2NrJy4KICAgIChweXRob24taGlkZXNob3ctZmluZC1uZXh0LWJsb2NrKTogTmV3IGZ1 bmN0aW9uIHRvIGJlIHVzZWQgYXMKICAgIEZJTkQtTkVYVC1CTE9DSy1GVU5DIGluIGBocy1zcGVj aWFsLW1vZGVzLWFsaXN0Jy4KICAgIChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1v Zi1ibG9jayk6IE5ldyBmdW5jdGlvbiB0byBiZQogICAgdXNlZCBhcyBMT09LSU5HLUFULUJMT0NL LVNUQVJULVAtRlVOQyBpbiBgaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdCcuCiAgICAocHl0aG9uLW1v ZGUpOiBDaGFuZ2Ugc2V0dGluZ3Mgb2YgYGhzLXNwZWNpYWwtbW9kZXMtYWxpc3QnLgogICAgCiAg ICAqIHRlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCiAgICAocHl0aG9uLWhpZGVz aG93LWhpZGUtbGV2ZWxzLTEpOiBGaXggdG8ga2VlcCBlbXB0eSBsaW5lcy4KICAgIChweXRob24t aW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jay0xKQogICAgKHB5dGhvbi1oaWRlc2hv dy1oaWRlLWxldmVscy0zLCBweXRob24taGlkZXNob3ctaGlkZS1sZXZlbHMtNCkKICAgIChweXRo b24taGlkZXNob3ctaGlkZS1hbGwtMSwgcHl0aG9uLWhpZGVzaG93LWhpZGUtYWxsLTIpCiAgICAo cHl0aG9uLWhpZGVzaG93LWhpZGUtYWxsLTMsIHB5dGhvbi1oaWRlc2hvdy1oaWRlLWJsb2NrLTEp OiBOZXcKICAgIHRlc3RzLgoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbCBi L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbAppbmRleCA0NGRmMzE4NmIyLi4yOTU2MzZjMzJlIDEw MDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMv cHl0aG9uLmVsCkBAIC0xNTA0LDYgKzE1MDQsMTAgQEAgcHl0aG9uLW5hdi1iZWdpbm5pbmctb2Yt ZGVmdW4tcmVnZXhwCiBUaGUgbmFtZSBvZiB0aGUgZGVmdW4gc2hvdWxkIGJlIGdyb3VwZWQgc28g aXQgY2FuIGJlIHJldHJpZXZlZAogdmlhIGBtYXRjaC1zdHJpbmcnLiIpCiAKKyhkZWZ2YXIgcHl0 aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2stcmVnZXhwCisgIChweXRob24tcnggbGluZS1zdGFy dCAoKiBzcGFjZSkgYmxvY2stc3RhcnQpCisgICJSZWdleHAgbWF0Y2hpbmcgYmxvY2sgc3RhcnQu IikKKwogKGRlZnVuIHB5dGhvbi1uYXYtLWJlZ2lubmluZy1vZi1kZWZ1biAoJm9wdGlvbmFsIGFy ZykKICAgIkludGVybmFsIGltcGxlbWVudGF0aW9uIG9mIGBweXRob24tbmF2LWJlZ2lubmluZy1v Zi1kZWZ1bicuCiBXaXRoIHBvc2l0aXZlIEFSRyBzZWFyY2ggYmFja3dhcmRzLCBlbHNlIHNlYXJj aCBmb3J3YXJkcy4iCkBAIC00ODg3LDkgKzQ4OTEsMzcgQEAgcHl0aG9uLWRlc2NyaWJlLWF0LXBv aW50CiAoZGVmdW4gcHl0aG9uLWhpZGVzaG93LWZvcndhcmQtc2V4cC1mdW5jdGlvbiAoX2FyZykK ICAgIlB5dGhvbiBzcGVjaWZpYyBgZm9yd2FyZC1zZXhwJyBmdW5jdGlvbiBmb3IgYGhzLW1pbm9y LW1vZGUnLgogQXJndW1lbnQgQVJHIGlzIGlnbm9yZWQuIgotICAocHl0aG9uLW5hdi1lbmQtb2Yt ZGVmdW4pCi0gICh1bmxlc3MgKHB5dGhvbi1pbmZvLWN1cnJlbnQtbGluZS1lbXB0eS1wKQotICAg IChiYWNrd2FyZC1jaGFyKSkpCisgIChweXRob24tbmF2LWVuZC1vZi1ibG9jaykpCisKKyhkZWZ1 biBweXRob24taGlkZXNob3ctZmluZC1uZXh0LWJsb2NrIChyZWdleHAgbWF4cCBjb21tZW50cykK KyAgIlB5dGhvbiBzcGVjaWZpYyBgaHMtZmluZC1uZXh0LWJsb2NrJyBmdW5jdGlvbiBmb3IgYGhz LW1pbm9yLW1vZGUnLgorQ2FsbCBgcHl0aG9uLW5hdi1mb3J3YXJkLWJsb2NrJyB0byBmaW5kIG5l eHQgYmxvY2sgYW5kIGNoZWNrIGlmCitibG9jay1zdGFydCBlbmRzIHdpdGhpbiBNQVhQLiAgSWYg Q09NTUVOVFMgaXMgbm90IG5pbCwgY29tbWVudHMKK2FyZSBhbHNvIHNlYXJjaGVkLiAgUkVHRVhQ IGlzIHBhc3NlZCB0byBgbG9va2luZy1hdCcgdG8gc2V0CitgbWF0Y2gtZGF0YScuIgorICAobGV0 KiAoKG5leHQtYmxvY2sgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAgICAgICAgICAgICAgIChv ciAoYW5kCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHB5dGhvbi1pbmZvLWxvb2tpbmct YXQtYmVnaW5uaW5nLW9mLWJsb2NrKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIChyZS1z ZWFyY2gtZm9yd2FyZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocHl0aG9uLXJ4IGJs b2NrLXN0YXJ0KSBtYXhwIHQpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFuZCAocHl0 aG9uLW5hdi1mb3J3YXJkLWJsb2NrKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo PCAocG9pbnQpIG1heHApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChyZS1zZWFy Y2gtZm9yd2FyZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHB5dGhvbi1yeCBi bG9jay1zdGFydCkgbWF4cCB0KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICgxKyBtYXhw KSkpKQorICAgICAgICAgKG5leHQtY29tbWVudAorICAgICAgICAgIChvciAod2hlbiBjb21tZW50 cworICAgICAgICAgICAgICAgIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAgICAgKGNs LWxvb3Agd2hpbGUgKHJlLXNlYXJjaC1mb3J3YXJkICIjIiBtYXhwIHQpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAocHl0aG9uLXN5bnRheC1jb250ZXh0ICdjb21tZW50KQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIChwb2ludCkpKSkKKyAgICAgICAgICAgICAgKDEr IG1heHApKSkKKyAgICAgICAgIChuZXh0LWJsb2NrLW9yLWNvbW1lbnQgKG1pbiBuZXh0LWJsb2Nr IG5leHQtY29tbWVudCkpKQorICAgICh3aGVuICg8PSBuZXh0LWJsb2NrLW9yLWNvbW1lbnQgbWF4 cCkKKyAgICAgIChnb3RvLWNoYXIgbmV4dC1ibG9jay1vci1jb21tZW50KQorICAgICAgKHNhdmUt ZXhjdXJzaW9uCisgICAgICAgIChiZWdpbm5pbmctb2YtbGluZSkKKyAgICAgICAgKGxvb2tpbmct YXQgcmVnZXhwKSkpKSkKIAogDAogOzs7IEltZW51CkBAIC01Mzg2LDYgKzU0MTgsMTkgQEAgcHl0 aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtZGVmdW4KICAgICAgICAgIChiZWdpbm5p bmctb2YtbGluZSAxKQogICAgICAgICAgKGxvb2tpbmctYXQgcHl0aG9uLW5hdi1iZWdpbm5pbmct b2YtZGVmdW4tcmVnZXhwKSkpKQogCisoZGVmdW4gcHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdp bm5pbmctb2YtYmxvY2sgKCkKKyAgIkNoZWNrIGlmIHBvaW50IGlzIGF0IHRoZSBiZWdpbm5pbmcg b2YgYmxvY2suIgorICAobGV0KiAoKGxpbmUtYmVnLXBvcyAobGluZS1iZWdpbm5pbmctcG9zaXRp b24pKQorICAgICAgICAgKGxpbmUtY29udGVudC1zdGFydCAoKyBsaW5lLWJlZy1wb3MgKGN1cnJl bnQtaW5kZW50YXRpb24pKSkKKyAgICAgICAgIChibG9jay1iZWctcG9zIChzYXZlLWV4Y3Vyc2lv bgorICAgICAgICAgICAgICAgICAgICAgICAgICAocHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxv Y2spKSkpCisgICAgKGFuZCBibG9jay1iZWctcG9zCisgICAgICAgICAoPSBibG9jay1iZWctcG9z IGxpbmUtY29udGVudC1zdGFydCkKKyAgICAgICAgICg8PSAocG9pbnQpIGxpbmUtY29udGVudC1z dGFydCkKKyAgICAgICAgIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAoYmVnaW5uaW5nLW9m LWxpbmUpCisgICAgICAgICAgIChsb29raW5nLWF0IHB5dGhvbi1uYXYtYmVnaW5uaW5nLW9mLWJs b2NrLXJlZ2V4cCkpKSkpCisKIChkZWZ1biBweXRob24taW5mby1jdXJyZW50LWxpbmUtY29tbWVu dC1wICgpCiAgICJSZXR1cm4gbm9uLW5pbCBpZiBjdXJyZW50IGxpbmUgaXMgYSBjb21tZW50IGxp bmUuIgogICAoY2hhci1lcXVhbApAQCAtNTgzNSwxNCArNTg4MCwxNyBAQCBweXRob24tbW9kZQog CiAgIChhZGQtdG8tbGlzdAogICAgJ2hzLXNwZWNpYWwtbW9kZXMtYWxpc3QKLSAgICcocHl0aG9u LW1vZGUKLSAgICAgIlxccy0qXFxfPFxcKD86ZGVmXFx8Y2xhc3NcXClcXF8+IgorICAgYChweXRo b24tbW9kZQorICAgICAscHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2stcmVnZXhwCiAgICAg IDs7IFVzZSB0aGUgZW1wdHkgc3RyaW5nIGFzIGVuZCByZWdleHAgc28gaXQgZG9lc24ndCBkZWZh dWx0IHRvCiAgICAgIDs7ICJcXHMpIi4gIFRoaXMgd2F5IHBhcmVucyBhdCBlbmQgb2YgZGVmdW4g YXJlIHByb3Blcmx5IGhpZGRlbi4KICAgICAgIiIKICAgICAgIiMiCiAgICAgIHB5dGhvbi1oaWRl c2hvdy1mb3J3YXJkLXNleHAtZnVuY3Rpb24KLSAgICAgbmlsKSkKKyAgICAgbmlsCisgICAgIHB5 dGhvbi1uYXYtYmVnaW5uaW5nLW9mLWJsb2NrCisgICAgIHB5dGhvbi1oaWRlc2hvdy1maW5kLW5l eHQtYmxvY2sKKyAgICAgcHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2sp KQogCiAgIChzZXRxLWxvY2FsIG91dGxpbmUtcmVnZXhwIChweXRob24tcnggKCogc3BhY2UpIGJs b2NrLXN0YXJ0KSkKICAgKHNldHEtbG9jYWwgb3V0bGluZS1oZWFkaW5nLWVuZC1yZWdleHAgIjpb XlxuXSpcbiIpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5l bCBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCmluZGV4IDllOGZhN2Y1NTIu LjYwOGNlNTQ4ZTcgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3Rz LmVsCisrKyBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCkBAIC01NTk4LDYg KzU1OTgsMzkgQEAgcHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtZGVmdW4tMgog ICAgKHNob3VsZCAobm90IChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1kZWZ1 bikpKQogICAgKHNob3VsZCAobm90IChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1v Zi1kZWZ1biBuaWwgdCkpKSkpCiAKKyhlcnQtZGVmdGVzdCBweXRob24taW5mby1sb29raW5nLWF0 LWJlZ2lubmluZy1vZi1ibG9jay0xICgpCisgIChweXRob24tdGVzdHMtd2l0aC10ZW1wLWJ1ZmZl cgorICAgIgorZGVmIGYoKToKKyAgICBpZiBUcnVlOgorICAgICAgICBwYXNzCisgICAgbCA9IFt4 ICogMgorICAgICAgICAgZm9yIHggaW4gcmFuZ2UoNSkKKyAgICAgICAgIGlmIHggPCAzXQorIyBp ZiBGYWxzZToKK1wiXCJcIgoraWYgMDoKK1wiXCJcIgorIgorICAgKHB5dGhvbi10ZXN0cy1sb29r LWF0ICJkZWYgZigpOiIpCisgICAoc2hvdWxkIChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lu bmluZy1vZi1ibG9jaykpCisgICAoZm9yd2FyZC1jaGFyKQorICAgKHNob3VsZCAobm90IChweXRo b24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jaykpKQorICAgKHB5dGhvbi10ZXN0 cy1sb29rLWF0ICJpZiBUcnVlOiIpCisgICAoc2hvdWxkIChweXRob24taW5mby1sb29raW5nLWF0 LWJlZ2lubmluZy1vZi1ibG9jaykpCisgICAoZm9yd2FyZC1jaGFyKQorICAgKHNob3VsZCAobm90 IChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jaykpKQorICAgKGJlZ2lu bmluZy1vZi1saW5lKQorICAgKHNob3VsZCAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5p bmctb2YtYmxvY2spKQorICAgKHB5dGhvbi10ZXN0cy1sb29rLWF0ICJmb3IgeCIpCisgICAoc2hv dWxkIChub3QgKHB5dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrKSkpCisg ICAocHl0aG9uLXRlc3RzLWxvb2stYXQgImlmIHggPCAzIikKKyAgIChzaG91bGQgKG5vdCAocHl0 aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2spKSkKKyAgIChweXRob24tdGVz dHMtbG9vay1hdCAiaWYgRmFsc2U6IikKKyAgIChzaG91bGQgKG5vdCAocHl0aG9uLWluZm8tbG9v a2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2spKSkKKyAgIChweXRob24tdGVzdHMtbG9vay1hdCAi aWYgMDoiKQorICAgKHNob3VsZCAobm90IChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmlu Zy1vZi1ibG9jaykpKSkpCisKIChlcnQtZGVmdGVzdCBweXRob24taW5mby1jdXJyZW50LWxpbmUt Y29tbWVudC1wLTEgKCkKICAgKHB5dGhvbi10ZXN0cy13aXRoLXRlbXAtYnVmZmVyCiAgICAiCkBA IC02MDUxLDggKzYwODQsMTEgQEAgcHl0aG9uLWhpZGVzaG93LWhpZGUtbGV2ZWxzLTEKIGNsYXNz IFNvbWVDbGFzczoKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBhcmcsIGt3YXJnPTEpOgorCiAg ICAgZGVmIGZpbHRlcihzZWxmLCBudW1zKToKLSAgICBkZWYgX19zdHJfXyhzZWxmKToiKSkpKQor CisgICAgZGVmIF9fc3RyX18oc2VsZik6CisiKSkpKQogICAgICAgKG9yIGVuYWJsZWQgKGhzLW1p bm9yLW1vZGUgLTEpKSkpKQogCiAoZXJ0LWRlZnRlc3QgcHl0aG9uLWhpZGVzaG93LWhpZGUtbGV2 ZWxzLTIgKCkKQEAgLTYwOTgsNiArNjEzNCwxNjUgQEAgcHl0aG9uLWhpZGVzaG93LWhpZGUtbGV2 ZWxzLTIKICIpKSkpCiAgICAgICAob3IgZW5hYmxlZCAoaHMtbWlub3ItbW9kZSAtMSkpKSkpCiAK KyhlcnQtZGVmdGVzdCBweXRob24taGlkZXNob3ctaGlkZS1sZXZlbHMtMyAoKQorICAiU2hvdWxk IGhpZGUgYWxsIGJsb2Nrcy4iCisgIChweXRob24tdGVzdHMtd2l0aC10ZW1wLWJ1ZmZlcgorICAg IgorZGVmIGYoKToKKyAgICBpZiAwOgorICAgICAgICBsID0gW2kgZm9yIGkgaW4gcmFuZ2UoNSkK KyAgICAgICAgICAgICBpZiBpIDwgM10KKyAgICAgICAgYWJjID0gby5tYXRjaCgxLCAyLCAzKQor CitkZWYgZygpOgorICAgIHBhc3MKKyIKKyAgIChocy1taW5vci1tb2RlIDEpCisgICAoaHMtaGlk ZS1sZXZlbCAxKQorICAgKHNob3VsZAorICAgIChzdHJpbmc9CisgICAgIChweXRob24tdGVzdHMt dmlzaWJsZS1zdHJpbmcpCisgICAgICIKK2RlZiBmKCk6CisKK2RlZiBnKCk6CisiKSkpKQorCiso ZXJ0LWRlZnRlc3QgcHl0aG9uLWhpZGVzaG93LWhpZGUtbGV2ZWxzLTQgKCkKKyAgIlNob3VsZCBo aWRlIDJuZCBsZXZlbCBibG9jay4iCisgIChweXRob24tdGVzdHMtd2l0aC10ZW1wLWJ1ZmZlcgor ICAgIgorZGVmIGYoKToKKyAgICBpZiAwOgorICAgICAgICBsID0gW2kgZm9yIGkgaW4gcmFuZ2Uo NSkKKyAgICAgICAgICAgICBpZiBpIDwgM10KKyAgICAgICAgYWJjID0gby5tYXRjaCgxLCAyLCAz KQorCitkZWYgZygpOgorICAgIHBhc3MKKyIKKyAgIChocy1taW5vci1tb2RlIDEpCisgICAoaHMt aGlkZS1sZXZlbCAyKQorICAgKHNob3VsZAorICAgIChzdHJpbmc9CisgICAgIChweXRob24tdGVz dHMtdmlzaWJsZS1zdHJpbmcpCisgICAgICIKK2RlZiBmKCk6CisgICAgaWYgMDoKKworZGVmIGco KToKKyAgICBwYXNzCisiKSkpKQorCisoZXJ0LWRlZnRlc3QgcHl0aG9uLWhpZGVzaG93LWhpZGUt YWxsLTEgKCkKKyAgIlNob3VsZCBoaWRlIGFsbCBibG9ja3MuIgorICAocHl0aG9uLXRlc3RzLXdp dGgtdGVtcC1idWZmZXIKKyAgICJpZiAwOgorCisgICAgYWFhCisgICAgbCA9IFtpIGZvciBpIGlu IHJhbmdlKDUpCisgICAgICAgICBpZiBpIDwgM10KKyAgICBjY2MKKyAgICBhYmMgPSBvLm1hdGNo KDEsIDIsIDMpCisgICAgZGRkCisKK2RlZiBmKCk6CisgICAgcGFzcworIgorICAgKGhzLW1pbm9y LW1vZGUgMSkKKyAgIChocy1oaWRlLWFsbCkKKyAgIChzaG91bGQKKyAgICAoc3RyaW5nPQorICAg ICAocHl0aG9uLXRlc3RzLXZpc2libGUtc3RyaW5nKQorICAgICAiaWYgMDoKKworZGVmIGYoKToK KyIpKSkpCisKKyhlcnQtZGVmdGVzdCBweXRob24taGlkZXNob3ctaGlkZS1hbGwtMiAoKQorICAi U2hvdWxkIGhpZGUgY29tbWVudHMuIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZmZXIK KyAgICIKKyMgTXVsdGkgbGluZQorIyBjb21tZW50CisKK1wiXCJcIgorIyBNdWx0aSBsaW5lCisj IHN0cmluZworXCJcIlwiCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKGhzLWhpZGUtYWxs KQorICAgKHNob3VsZAorICAgIChzdHJpbmc9CisgICAgIChweXRob24tdGVzdHMtdmlzaWJsZS1z dHJpbmcpCisgICAgICIKKyMgTXVsdGkgbGluZQorCitcIlwiXCIKKyMgTXVsdGkgbGluZQorIyBz dHJpbmcKK1wiXCJcIgorIikpKSkKKworKGVydC1kZWZ0ZXN0IHB5dGhvbi1oaWRlc2hvdy1oaWRl LWFsbC0zICgpCisgICJTaG91bGQgbm90IGhpZGUgY29tbWVudHMgd2hlbiBgaHMtaGlkZS1jb21t ZW50cy13aGVuLWhpZGluZy1hbGwnIGlzIG5pbC4iCisgIChweXRob24tdGVzdHMtd2l0aC10ZW1w LWJ1ZmZlcgorICAgIgorIyBNdWx0aSBsaW5lCisjIGNvbW1lbnQKKworXCJcIlwiCisjIE11bHRp IGxpbmUKKyMgc3RyaW5nCitcIlwiXCIKKyIKKyAgIChocy1taW5vci1tb2RlIDEpCisgICAobGV0 ICgoaHMtaGlkZS1jb21tZW50cy13aGVuLWhpZGluZy1hbGwgbmlsKSkKKyAgICAgKGhzLWhpZGUt YWxsKSkKKyAgIChzaG91bGQKKyAgICAoc3RyaW5nPQorICAgICAocHl0aG9uLXRlc3RzLXZpc2li bGUtc3RyaW5nKQorICAgICAiCisjIE11bHRpIGxpbmUKKyMgY29tbWVudAorCitcIlwiXCIKKyMg TXVsdGkgbGluZQorIyBzdHJpbmcKK1wiXCJcIgorIikpKSkKKworKGVydC1kZWZ0ZXN0IHB5dGhv bi1oaWRlc2hvdy1oaWRlLWJsb2NrLTEgKCkKKyAgIlNob3VsZCBoaWRlIGN1cnJlbnQgYmxvY2su IgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZmZXIKKyAgICIKK2lmIDA6CisKKyAgICBh YWEKKyAgICBsID0gW2kgZm9yIGkgaW4gcmFuZ2UoNSkKKyAgICAgICAgIGlmIGkgPCAzXQorICAg IGNjYworICAgIGFiYyA9IG8ubWF0Y2goMSwgMiwgMykKKyAgICBkZGQKKworZGVmIGYoKToKKyAg ICBwYXNzCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKHB5dGhvbi10ZXN0cy1sb29rLWF0 ICJkZGQiKQorICAgKGZvcndhcmQtbGluZSkKKyAgIChocy1oaWRlLWJsb2NrKQorICAgKHNob3Vs ZAorICAgIChzdHJpbmc9CisgICAgIChweXRob24tdGVzdHMtdmlzaWJsZS1zdHJpbmcpCisgICAg ICIKK2lmIDA6CisKK2RlZiBmKCk6CisgICAgcGFzcworIikpKSkKKwogCiAoZXJ0LWRlZnRlc3Qg cHl0aG9uLXRlc3RzLS1weXRob24tbmF2LWVuZC1vZi1zdGF0ZW1lbnQtLWluZmxvb3AgKCkKICAg IkNoZWNrcyB0aGF0IGBweXRob24tbmF2LWVuZC1vZi1zdGF0ZW1lbnQnIGRvZXNuJ3QgaW5mbG9v cCBpbiBhCg== --00000000000077088405e648e645-- From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 15 13:20:06 2022 Received: (at 56635) by debbugs.gnu.org; 15 Aug 2022 17:20:06 +0000 Received: from localhost ([127.0.0.1]:43981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNdl0-0001Xx-Co for submit@debbugs.gnu.org; Mon, 15 Aug 2022 13:20:06 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:44307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNdkx-0001XM-Sv for 56635@debbugs.gnu.org; Mon, 15 Aug 2022 13:20:05 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 78C625C016C; Mon, 15 Aug 2022 13:19:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 13:19:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secretsauce.net; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1660583998; x=1660670398; bh=cF ajvc+ry6gquHKxwS66SQhlX8sAno1UOnj9dHPrEsk=; b=fQf6dNXcW+z8VVQZLo XQwyHG2iZnZUWHFuCEgzXMjp5ob42LnaxoWjhcMLl5ad5uUR8Vlexl9V9cm52DHK 544QS2vArOCdec9vjqeDJuJup/J6A9pvrhp0fI7g1/MZvZPhamE1Bip5E2ePLC9p 9QUbVH79vnak0eHj9Ct57Fs4CURAeq1jij/r4d9mQ2QIcX2cqanPVNtWgEkXIOrE UBw4Lai+x6ihzb3p6cSOUNt7jzBQVFf4pXwnjUAtgRaEkWpmTKDems3Hqob6dW83 etoz5DZq0aaNepoPe7ei53jp1mrtuciOPgEZnInq7lUl5Avpz/ThRTqZjL3/lZkX ZeIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1660583998; x=1660670398; bh=cFajvc+ry6gquHKxwS66SQhlX8sA no1UOnj9dHPrEsk=; b=z0b46eTC6w3h38qVuRVGMRJtTInWoRkBeEdS+VhsV/je dYvPokXpmAuHHZIu8+WlN9eWN20q+t+UjioxGJminW9OY31qVxWHKP497SPRuMMk 4yVmYp6+iCZWg+rwwiKTYTrBpmsZGdWvNaClDAtqcmLqdrf528alHPdf9YzNDg2V IUVYJYNrFGxQSDzciJ1aiPJPctY3wQ/ud7sXz0Rt0hvZ5XxOT/BOsK5NH58alrt6 WGAQT7UiEgjw4OkURityy/0j//EPQ0imxsZMGJNHkQjgpFyS/Zs3h2+P/w/kfU3i S8PBhu0gPBB/WW8Fw2tc0YHDXktuQkELZaV0Ko6OjQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehvddgudduvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpehffgfhvfevufffjgfkgggtsehttdertddtredtnecuhfhrohhmpeffihhm rgcumfhoghgrnhcuoeguihhmrgesshgvtghrvghtshgruhgtvgdrnhgvtheqnecuggftrf grthhtvghrnhepgfeifeehgedvkeekvdevvdelvdegleevtedvueejvdejveduveeuleev leevudetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epughimhgrsehsvggtrhgvthhsrghutggvrdhnvght X-ME-Proxy: Feedback-ID: i3e8042a0:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 13:19:58 -0400 (EDT) References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> User-agent: mu4e 1.8.6; emacs 29.0.50 From: Dima Kogan To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks Date: Mon, 15 Aug 2022 10:16:14 -0700 In-reply-to: Message-ID: <87bkslpgp2.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , Augusto Stoffel , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Thanks for working on this. I'll try it out in a bit. How do you usually test it? The main modification is in (define-derived-mode python-mode prog-mode "Python" ... ... (add-to-list 'hs-special-modes-alist `(python-mode .... Re-evaluating the (define-derived-mode ...) form doesn't do it, obviously. I've tried to manually update hs-special-modes-alist, but that doesn't work right either. What do you do? Ideally I'd like to drop something into my ~/.emacs to use the patched logic to long-term test this, but I haven't been able to figure it out. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 15 22:29:00 2022 Received: (at 56635) by debbugs.gnu.org; 16 Aug 2022 02:29:00 +0000 Received: from localhost ([127.0.0.1]:44414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNmKC-0006f4-8a for submit@debbugs.gnu.org; Mon, 15 Aug 2022 22:29:00 -0400 Received: from mail-ej1-f48.google.com ([209.85.218.48]:37814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNmKB-0006er-96 for 56635@debbugs.gnu.org; Mon, 15 Aug 2022 22:28:59 -0400 Received: by mail-ej1-f48.google.com with SMTP id kb8so16532371ejc.4 for <56635@debbugs.gnu.org>; Mon, 15 Aug 2022 19:28:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=nfF3d/Sma9FXB0ZI/E8As+EnL7m91HdIacBhN+eLtH4=; b=Fr+/6vP8eHdXoxrqrK0uc2TNsukbAewvvO5DZSj4F2Z2EtvtDZerNsUnk9hZoQC8jx esIxBpzrnwFBhwp8vjiW3rvvK6T9mzcbOG6YTBvYBgOVcfs9J9/LoagsCJJqyNxiDp0Z WiM2znLtGfMB34YD44KoLPXVlegcmUbikAc3TgDJHiyoWBJGUkW1okEXa73xdZ1YYF6w qgdi0fbouY96T3EQb0CIwv0tHQV17Qc2UM3gzAoyREE4wBkv1wQdPrYsO5MGiMGcbncj 5TlScv5NansDCehqZVHYn3JGJSy0qjK/Rz0MaHYbJtwMMdaNp/drHT8HE6XrJVtqiUS0 SmBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=nfF3d/Sma9FXB0ZI/E8As+EnL7m91HdIacBhN+eLtH4=; b=A0qYRXA54wxnwUsOah/lRlYyzOnwQ8P0gA5wJuRxLFfFoESbuJZd97Qotm4nljIdnR CsYes9FTOtpiuaSvp4057rR2peDSHSHGQ3Sn//n+nU4/MtntQNt3Ace+o6v9rZ2+NNGp dVGhAtMRrZJ0O4Mzvffw+t8ZQAfq+LgajzsNA3CyxIK0sMRKlTXLqcdL12tRXT77+Arz z3BoMWw8V7H8VFhOXm5ACioIV9EuCGA1GomhiPavrzqDM5F7whnvTjITkvCvbIjAQUBc ztg9+v7FKcZLHX5f1Q4/VhT3eI01epl1W6xmqpPcIfivJsSZ6uDr0lQ4Rv2u7UPrzjAM PREg== X-Gm-Message-State: ACgBeo3in7+w4y/lUa3IkS7Aoa1vyG5gTFFM8Ur2YWYnHQkMof8wygYm +vJFXtbtOFeWg+XJiGQY9deT+1kpwq4By+hFVHQ= X-Google-Smtp-Source: AA6agR5ibU7lGd+DMzoXefqt329hhEhXNIgBvKTqJivxTwiD8d6dAO03AKDvZR3lZA9BAnIw+48FUdbMLJlcdHYVh4s= X-Received: by 2002:a17:906:9bc4:b0:730:957f:34b3 with SMTP id de4-20020a1709069bc400b00730957f34b3mr11911908ejc.231.1660616933326; Mon, 15 Aug 2022 19:28:53 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87bkslpgp2.fsf@secretsauce.net> In-Reply-To: <87bkslpgp2.fsf@secretsauce.net> From: kobarity Date: Tue, 16 Aug 2022 11:28:40 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Dima Kogan Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , Augusto Stoffel , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Dima Kogan wrote: > Thanks for working on this. I'll try it out in a bit. How do you usually > test it? You need the latest source code (master branch) to apply the patches. Here are how to test them: - patch -p1 < fix-56635-hideshow.patch - patch -p1 < fix-56635-python.patch - emacs -Q - M-x load-file "patched python.el" - M-x load-file "patched hideshow.el" - M-x find-file "Python file to test" - M-x hs-minor-mode If you want to load patched files in ~/.emacs, following settings should suffice: (load "/somewhere patched/python.el") (load "/somewhere patched/hideshow.el") As for ERTs, I'm testing them with the following command in the patched source code tree: src/emacs -batch -l ert -l lisp/progmodes/hideshow.el -l lisp/progmodes/python.el -l test/lisp/progmodes/python-tests.el -l test/lisp/progmodes/hideshow-tests.el --eval '(let ((python-tests-shell-interpreter "python3")) (ert-run-tests-batch-and-exit))' I'm looking forward to your feedback. Regards, From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 17 06:45:33 2022 Received: (at 56635) by debbugs.gnu.org; 17 Aug 2022 10:45:33 +0000 Received: from localhost ([127.0.0.1]:49509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOGYH-0007th-5h for submit@debbugs.gnu.org; Wed, 17 Aug 2022 06:45:33 -0400 Received: from quimby.gnus.org ([95.216.78.240]:44194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOGYF-0007tQ-Gl for 56635@debbugs.gnu.org; Wed, 17 Aug 2022 06:45:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+Jrh83T7kjKPwxzyUDJo22r5eEduCAi8oA2Gaa7BEqw=; b=eYocqyjGk3f2DJbrn5+XDtSbGw IxkD/p0/g4itq/zmwTVfmjCAISXOtGLWASnq662pRIBVilqG6Ap4TsEryr6EnQS+sD4dohMepyuAw sl5E8pPOA6VHtFlheEGDtR+W2lTp0tdOyyZBZCMccZzlT3/POpoMTbraJGOYsNB0x3uo=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOGY6-00086b-PF; Wed, 17 Aug 2022 12:45:24 +0200 From: Lars Ingebrigtsen To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks In-Reply-To: (kobarity@gmail.com's message of "Tue, 16 Aug 2022 00:00:48 +0900") References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> X-Now-Playing: King Crimson's _Three of a Perfect Pair_: "Dig Me" Date: Wed, 17 Aug 2022 12:45:20 +0200 Message-ID: <87tu6bjghr.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: kobarity writes: > I fixed some issues in the Python patch. Please note that the fix for > #57223 (merged recently) is also needed for all ERTs to pass. Thanks; pushed to Emacs 29. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56635 Cc: Augusto Stoffel , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) kobarity writes: > I fixed some issues in the Python patch. Please note that the fix for > #57223 (merged recently) is also needed for all ERTs to pass. Thanks; pushed to Emacs 29. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 17 06:45:41 2022 Received: (at control) by debbugs.gnu.org; 17 Aug 2022 10:45:41 +0000 Received: from localhost ([127.0.0.1]:49512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOGYP-0007u5-DH for submit@debbugs.gnu.org; Wed, 17 Aug 2022 06:45:41 -0400 Received: from quimby.gnus.org ([95.216.78.240]:44210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOGYO-0007tp-4U for control@debbugs.gnu.org; Wed, 17 Aug 2022 06:45:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7t/16OTYk81DSk1m++/MSbHpWqCaa2BsXft0wlyAsX8=; b=IMQzbVr1xa+EkqIncqcyqRrgNj A5/f5xtnx5eE/G4xYbV3gf5ShLCZTp29lLZOS/FBLdgX2dWeXInHVaO5LmKg99IEnpNnXgTa5qBj1 uHU6VEtw+tbSzPfDVJ2+MQCqeNejVwIpQ+U6jzDpjuNFNREiAuSTSt+hHr0nEJAVPOik=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOGYG-00086n-Hk for control@debbugs.gnu.org; Wed, 17 Aug 2022 12:45:34 +0200 Date: Wed, 17 Aug 2022 12:45:32 +0200 Message-Id: <87sflvjghf.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #56635 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 56635 29.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 56635 29.1 quit From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 17 07:11:38 2022 Received: (at 56635) by debbugs.gnu.org; 17 Aug 2022 11:11:38 +0000 Received: from localhost ([127.0.0.1]:49561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOGxV-0002Jr-Ty for submit@debbugs.gnu.org; Wed, 17 Aug 2022 07:11:38 -0400 Received: from quimby.gnus.org ([95.216.78.240]:44518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOGxU-0002Je-2Q for 56635@debbugs.gnu.org; Wed, 17 Aug 2022 07:11:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0GOIQ2MK++QH5cPXxhZqGcRTUNazUoIVczJjInV1Lu0=; b=CoTuOetk1jQy+xRcd+373pQ2o2 7r6THYdofXXKABkDMMic8OfR1DCg0NiUz5qEWnGqVC86LnEFdeTnwWtgfhKKALFkXbieqs1VVCZll T4kRh2aJG7NLU+KkzrOcIEyhp0/BSOvfZ2+YwE1PGKIDPpRUFdc8glypcbBustTRDULE=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOGxL-0008KP-7J; Wed, 17 Aug 2022 13:11:29 +0200 From: Lars Ingebrigtsen To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks In-Reply-To: <87tu6bjghr.fsf@gnus.org> (Lars Ingebrigtsen's message of "Wed, 17 Aug 2022 12:45:20 +0200") References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87tu6bjghr.fsf@gnus.org> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAFVBMVEUdEjJDQ1Nkzaio n6SZBjGzSWb///88yPsLAAAAAWJLR0QGYWa4fQAAAAd0SU1FB+YIEQsLCDVmlxwAAAGfSURBVDjL fZNRbuMwDERJwwcg5fbfEnqAuqr/s6hzgEXW979Kh6Rkp226RJDIehpyaCpEEappZi5lxpqVUqED 5CIAgnUpqXTAJSOoZJ6xtsAeMiiOlLlQEhZK2YG6EJE1E5uYAyDtEIC9AKWWCh+kchIVdWoABoVC pC55q4u54tltOYhUs2vsuD9arlipaAWIfXG/vhyKZreL9bZtQ89EYV5NMQII2pGzGg7h6QngknJk jS4ydbBdirIcivBh+39wlM4a4cNTIUnyg6yHD08FNvQW+zQ66E0OHYwBqDfJ1oa54gaGBoaSkw1b m0KoVcWcodAkTx305K4TVdsdA7QX3HRbq4HqMx0xlJc7cO6jYG/DhvcbkDuQZDtTBdDGO4CrBnKg Di4UA2HMXPUObJg/7q4ybv430APoMSB/t9O6Xv/d9uu+66J4p3bcBXWtH+9rjdD2W83c5ord2Wt9 DmD+rvu6W/zVSRfWs/uPWxxa7GuqJ7iuN0ev07RMVU9n4yO7/wX0GJy35AcQ+gbs+kj/4/xUYD7j Mdsv4HLc3S/xCcG+cosVQBUKAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIyLTA4LTE3VDExOjExOjA4 KzAwOjAwDAhDqwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0wOC0xN1QxMToxMTowOCswMDowMH1V +xcAAAAASUVORK5CYII= X-Now-Playing: Nadjam's _It's a Crammed, Crammed, Crammed, Crammed World!_: "Kullish Cahared" Date: Wed, 17 Aug 2022 13:11:26 +0200 Message-ID: <871qtfjfa9.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Lars Ingebrigtsen writes: > > kobarity writes: > >> I fixed some issues in the Python patch. Please note that the fix for >> #57223 (merged recently) is also needed for all ERTs to pass. > > Thanks; pushed [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56635 Cc: Augusto Stoffel , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Lars Ingebrigtsen writes: > > kobarity writes: > >> I fixed some issues in the Python patch. Please note that the fix for >> #57223 (merged recently) is also needed for all ERTs to pass. > > Thanks; pushed to Emacs 29. This led to test failures I didn't notice before pushing: 4 unexpected results: FAILED python-hideshow-hide-all-2 FAILED python-hideshow-hide-block-1 FAILED python-hideshow-hide-levels-1 FAILED python-hideshow-hide-levels-2 So I've now reverted the change. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 17 07:33:16 2022 Received: (at 56635) by debbugs.gnu.org; 17 Aug 2022 11:33:16 +0000 Received: from localhost ([127.0.0.1]:49625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOHIS-0007FQ-F1 for submit@debbugs.gnu.org; Wed, 17 Aug 2022 07:33:16 -0400 Received: from mail-ej1-f51.google.com ([209.85.218.51]:39801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oOHIN-0007FA-Ob for 56635@debbugs.gnu.org; Wed, 17 Aug 2022 07:33:14 -0400 Received: by mail-ej1-f51.google.com with SMTP id i14so23974506ejg.6 for <56635@debbugs.gnu.org>; Wed, 17 Aug 2022 04:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=MHOpJzPkhi9aFxEC269B0zJTi25+nf2LImZFAbslEpA=; b=RC9Hqne/HEMbti0OWw4TwVUu6NqgbtICXQPRao/YgnQA+R3NdhGhgynVOHkAwGSsWG RFkNOArLnWQMbJyqoQ1vlsqiOEUTOO1xR5l0iLhfpR5hYXL9H8mJ6JMFbOOvLShubWFU 26HoqoTYGzzE1YdK/vgSOkU/nINhb0DcyK12RCsIJ+HrkGLcnilWEmO4H+BI8MsrYlTd Fk3Eg3yfR/OzTWMGy2ak4Cn+LGPdfbh/82ZVFjuqDy9VMagdpexKaHgfi/BAJHDBcdl4 0E0Q6eQykh6kKSN9Vh4APlvmZIqI6bpFiluRZo3eRbL1ed9oiw2fUQy69r9SgTkXhzot d5Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=MHOpJzPkhi9aFxEC269B0zJTi25+nf2LImZFAbslEpA=; b=uX5BC2YQIw6OZtqtnYlnmXlm1f/x7IRej5LbIBz0nmoyvWtL1pEuQ4vCOeYa32c+Tt sTeZ9NRak5hyZV/oZUYWQYH5wOepCd6uLFSEGWB+uZDJluVbb6wszPpUKh/DOTeSG/Ss HdFbtoKGZ6zWCJLU2doo1/5PHQ2OKBgaEwzZ6TAXobVmH6NXfF/rcMQMiHCANumA0ytU PEOfHeYJCgAuvnY+NibmmWk1ln/rzlXv2IXhvKEpcrYUPfiRyejAQ/Vh4QOcumr1l/q+ Jdduwm38Xf/elaCpjeCrNmnzWuV2PADFVl77IGscaMSDwwjeNOPNj0fJq5Jsh5+LE8LY sArg== X-Gm-Message-State: ACgBeo1HgiVcoTHSg2Jy4jUGOLtTrpbP8KgdBz6UMBshrUXhfAtTffn0 xfxNYBDtTY+JsqnxXC5Vk4yoI4MtQs+uSPFRMTM= X-Google-Smtp-Source: AA6agR4Z/mzIcHtLBFJjbK3sPJa9EAeLy0j4gZ+5Po/2SoBT6j7OkU0S3SYJeiy1CSqYS1YoEDqZVRDu8CGrJ3FXlqA= X-Received: by 2002:a17:907:8a1e:b0:731:39b9:e00c with SMTP id sc30-20020a1709078a1e00b0073139b9e00cmr16476569ejc.65.1660735985742; Wed, 17 Aug 2022 04:33:05 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87tu6bjghr.fsf@gnus.org> <871qtfjfa9.fsf@gnus.org> In-Reply-To: <871qtfjfa9.fsf@gnus.org> From: kobarity Date: Wed, 17 Aug 2022 20:32:51 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Lars Ingebrigtsen Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Augusto Stoffel , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Lars Ingebrigtsen wrote: > This led to test failures I didn't notice before pushing: > > 4 unexpected results: > FAILED python-hideshow-hide-all-2 > FAILED python-hideshow-hide-block-1 > FAILED python-hideshow-hide-levels-1 > FAILED python-hideshow-hide-levels-2 > > So I've now reverted the change. Sorry for the confusion. It depends on the patch for hideshow.el (fix-56635-hideshow.patch) presented in: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=56635#32 All tests should pass if both patches are applied. However, I think we can wait for feedbacks from Dima and (hopefully) others. Best Regards, From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 23 20:48:54 2022 Received: (at 56635) by debbugs.gnu.org; 24 Aug 2022 00:48:54 +0000 Received: from localhost ([127.0.0.1]:45282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQeZi-0007t4-FM for submit@debbugs.gnu.org; Tue, 23 Aug 2022 20:48:54 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:57199) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQeZf-0007so-8h for 56635@debbugs.gnu.org; Tue, 23 Aug 2022 20:48:52 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 305E73200915; Tue, 23 Aug 2022 20:48:44 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 23 Aug 2022 20:48:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secretsauce.net; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1661302123; x=1661388523; bh=kF /vKOmyiDDUM9ggb8pOv26nkyboo/JVBNLQucjpuJY=; b=Zr1Jnri93sM12iymis OHQ5w2A/gO8D45RogUto1LSJwCjjQULTnLEXDCpPTp6L6sQhBG0An49vF+tHTlFy /cn15TxA+IPTnGBwwxyc+1XLXeLd2XcAMepURts2qMPdWE+8tyVNLQXB1JncQpNb AhJ3ukYA8JExF8MIhpOCPu0thnRZTQZ7iodtV4tDzrMj01i/aps7ETVIRm5o9Jrl tb/Z/9r1cFxaSjKswB/9G9IcJ1Fj5Xq3FcZs2/qjaPR6g83jrohjrVs4NiqwjDJ6 ilEIaMctSvnbPYl2T1lGWrBjmjl/LOyurkJX3qVc/Wmnkv4IMes5BxzdijNpRuAs 0BUA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1661302123; x=1661388523; bh=kF/vKOmyiDDUM9ggb8pOv26nkybo o/JVBNLQucjpuJY=; b=nF7ngtDG4y8ScPGP2+5+aQbH1iMK/temmWQt/IPFS6/C j45Q7r7KJiQebhaJ1JkBTylZXCtJnEUWx7L9wdeCbMTp7CZDmq4s//Lbq6txyyzr nNOvHYEOj7cVX0KAVwugKhda50ln1Ce+WekiTwg2IOXsJBIMeXu65Ipj9f3swz74 i00ecwme07PoxTcHZFUl+SDd6+/DXG/xQ15q4D2VZrPoh9lT1uvBbnAf9TUuoUhl ZSirWa8NNI1ujc0L9HI4SCLjgSP4tzOj/OROEJP/Skv31da3rkv9s15VIxg0OpTl WPh26YJG2wIiqG0nDlsiGtpe7eiNF1ONeDj7cJ1WGw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdejtddggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfhgfhffvvefuffgjkfggtgesthdtredttdertdenucfhrhhomhepffhimhgr ucfmohhgrghnuceoughimhgrsehsvggtrhgvthhsrghutggvrdhnvghtqeenucggtffrrg htthgvrhhnpefgieefheegvdekkedvvedvledvgeelveetvdeujedvjeevudevueelveel veduteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe guihhmrgesshgvtghrvghtshgruhgtvgdrnhgvth X-ME-Proxy: Feedback-ID: i3e8042a0:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 23 Aug 2022 20:48:43 -0400 (EDT) References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87tu6bjghr.fsf@gnus.org> <871qtfjfa9.fsf@gnus.org> User-agent: mu4e 1.8.6; emacs 29.0.50 From: Dima Kogan To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks Date: Tue, 23 Aug 2022 17:39:39 -0700 In-reply-to: Message-ID: <87bksa8o0o.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 56635 Cc: Lars Ingebrigtsen , Augusto Stoffel , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi. Thanks for working on this. I just tried this out, and it appears to work well! I think we can merge this. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 24 06:27:16 2022 Received: (at 56635) by debbugs.gnu.org; 24 Aug 2022 10:27:16 +0000 Received: from localhost ([127.0.0.1]:45715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQnbQ-0006VP-8m for submit@debbugs.gnu.org; Wed, 24 Aug 2022 06:27:16 -0400 Received: from quimby.gnus.org ([95.216.78.240]:48054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQnbO-0006VC-5z for 56635@debbugs.gnu.org; Wed, 24 Aug 2022 06:27:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=A3X9ThjNXVTRFsAZBbHVMYv9IE21Beh/we38lmBjeUo=; b=gUJ1xPHG1poaz/oO9r1CubKKae e1OLHhmUTt8Q67OPtB128x0HzFc8a/gyHC1iHzdzNpHnpv6beNJ7YwuKaeEq9aBWkSRvAtvn6H+zB ONBH9VkPcs00HRpr2yT9LnX+OyH/cI+ZQSIzXDqH5PlJb3w37ml4jmh+n9eVuWZx8jeU=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oQnbF-0004O7-AM; Wed, 24 Aug 2022 12:27:07 +0200 From: Lars Ingebrigtsen To: Dima Kogan Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks In-Reply-To: <87bksa8o0o.fsf@secretsauce.net> (Dima Kogan's message of "Tue, 23 Aug 2022 17:39:39 -0700") References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87tu6bjghr.fsf@gnus.org> <871qtfjfa9.fsf@gnus.org> <87bksa8o0o.fsf@secretsauce.net> X-Now-Playing: The Flying Lizards's _The Flying Lizards_: "All Guitars" Date: Wed, 24 Aug 2022 12:27:04 +0200 Message-ID: <877d2yos1z.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dima Kogan writes: > Hi. Thanks for working on this. I just tried this out, and it appears to > work well! I think we can merge this. Since this depends on two patch sets (and there are different ones?), could you (kobarity, that is) repost the patches (in the order they should be applied), and I'll get them pushed. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56635 Cc: kobarity , Augusto Stoffel , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Dima Kogan writes: > Hi. Thanks for working on this. I just tried this out, and it appears to > work well! I think we can merge this. Since this depends on two patch sets (and there are different ones?), could you (kobarity, that is) repost the patches (in the order they should be applied), and I'll get them pushed. From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 24 10:15:56 2022 Received: (at 56635) by debbugs.gnu.org; 24 Aug 2022 14:15:56 +0000 Received: from localhost ([127.0.0.1]:47587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQrAi-0006qO-Hf for submit@debbugs.gnu.org; Wed, 24 Aug 2022 10:15:56 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:37691) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQrAd-0006q3-Od for 56635@debbugs.gnu.org; Wed, 24 Aug 2022 10:15:55 -0400 Received: by mail-ej1-f53.google.com with SMTP id h22so23545850ejk.4 for <56635@debbugs.gnu.org>; Wed, 24 Aug 2022 07:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=PorepsTsM38jW8HnbCYEKGp8gsBdr+azoSR3mj4Y8lQ=; b=CsiRpSZTsTCPYHKadud+CYRKxLIgO8zXOoAzjCUO5z3793/TnE3ExRHoLD4cyM4fF0 GafzoamsVPfNgVKc/zUbUtgzMxq2ewxoNMTZsq4TSVcSKyn4nBaxpGfyPU4HuV2SQqxW I+UYl+ywS4pmnTfbrG4I5E2bGB1zUghrFZDvavhCHz2bGj/ZjnElb0pMHJ4Lr0swMrMF s381hsU8RjSzRxBavSRu2uh6hpnfgE1EiFFi3+d1zW/VkWyOHJr0xYh/8x2gssdTxUn4 GkEYJUYX6kbKjGvupjG7dPYxP32a28SnDpgrW0WJPRWwNUa4LwnXcOUQS38SVxmv3wVs /UfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=PorepsTsM38jW8HnbCYEKGp8gsBdr+azoSR3mj4Y8lQ=; b=SZvahri1VmcRC27xJ1BMKHrSNjdC0eXbt49Khx5AVpv04kefzWfQxZBucbzxJJqTTA /OOZ0Eg5EeRz5DzWjmaBu0YyyUqdJmJfipaO/Yrq6Ef2FVP1+pM9HqjeSBm+IEp1BBd8 rMao4b4Hpr4bxYh5CMocItdJZMmLInovmMc9ANaWnnVUFMddNRQ/Rt/qnQXSQHOfHEAJ mbaDA9fu/HnrFavKphqn6rwu9YG+pk8vZrpevjMAhqtTp9nG825LYLEg7bo+7YCxdBIe 4r4mIFNYfsu1mp3gZLlQ1Qyq6JZmkTI+0NnTSfnLQzJIZ8hj7i5A0FVZa69gGnxWmqnn 2yjw== X-Gm-Message-State: ACgBeo3eZaJx0in7jr4BI1GlmmBvr06hxsnk4qg5QBQ7fkSdYoRX7oa4 7SfEpg50IaEfCbZ11DXtcfiHh+/mFBRu3NdncTw= X-Google-Smtp-Source: AA6agR5LCPwQWpg2Jym/yJ//2ePj098ufBn4AP/L33bJF6M7EE0YqCrQX9yW2V4dy2UR2kNhah/FX15xBv9om7CJhG8= X-Received: by 2002:a17:906:8a6a:b0:73d:c740:f836 with SMTP id hy10-20020a1709068a6a00b0073dc740f836mr379806ejc.14.1661350546171; Wed, 24 Aug 2022 07:15:46 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87tu6bjghr.fsf@gnus.org> <871qtfjfa9.fsf@gnus.org> <87bksa8o0o.fsf@secretsauce.net> <877d2yos1z.fsf@gnus.org> In-Reply-To: <877d2yos1z.fsf@gnus.org> From: kobarity Date: Wed, 24 Aug 2022 23:15:31 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Lars Ingebrigtsen Content-Type: multipart/mixed; boundary="000000000000275b4805e6fd51a5" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Augusto Stoffel , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --000000000000275b4805e6fd51a5 Content-Type: text/plain; charset="UTF-8" Lars Ingebrigtsen wrote: > > Dima Kogan writes: > > > Hi. Thanks for working on this. I just tried this out, and it appears to > > work well! I think we can merge this. > > Since this depends on two patch sets (and there are different ones?), > could you (kobarity, that is) repost the patches (in the order they > should be applied), and I'll get them pushed. Dima, thank you for your feedback! Lars, attached are the revised and rebased patches. They should be applied in the order: - 1-hideshow.patch - 2-python.patch No other patches are required. Thank you for your cooperation. Best regards, --000000000000275b4805e6fd51a5 Content-Type: application/octet-stream; name="1-hideshow.patch" Content-Disposition: attachment; filename="1-hideshow.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l77p3qx40 Y29tbWl0IGNkZmQ1YTY0ZmIyYzk3Njg0Y2I5MmIwYWU4NGFhZGE4NGEzMGFkOTcKQXV0aG9yOiBr b2Jhcml0eSA8a29iYXJpdHlAZ21haWwuY29tPgpEYXRlOiAgIFdlZCBBdWcgMjQgMjI6MjY6NDcg MjAyMiArMDkwMAoKICAgIEV4dGVuZCBgaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdCcgZm9yIGxhbmd1 YWdlcyBzdWNoIGFzIFB5dGhvbgogICAgCiAgICAqIGxpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVs IChocy1zcGVjaWFsLW1vZGVzLWFsaXN0KTogQWRkCiAgICBlbGVtZW50cyBGSU5ELUJMT0NLLUJF R0lOTklORy1GVU5DLCBGSU5ELU5FWFQtQkxPQ0stRlVOQywgYW5kCiAgICBMT09LSU5HLUFULUJM T0NLLVNUQVJULVAtRlVOQy4KICAgIChocy1maW5kLWJsb2NrLWJlZ2lubmluZy1mdW5jKTogTmV3 IHZhcmlhYmxlIHRvIGhvbGQKICAgIEZJTkQtQkxPQ0stQkVHSU5OSU5HLUZVTkMuCiAgICAoaHMt ZmluZC1uZXh0LWJsb2NrLWZ1bmMpOiBOZXcgdmFyaWFibGUgdG8gaG9sZAogICAgRklORC1ORVhU LUJMT0NLLUZVTkMuCiAgICAoaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wLWZ1bmMpOiBOZXcg dmFyaWFibGUgdG8gaG9sZAogICAgTE9PS0lORy1BVC1CTE9DSy1TVEFSVC1QLUZVTkMuCiAgICAo aHMtZ3Jvay1tb2RlLXR5cGUpOiBTZXQgbmV3IHZhcmlhYmxlcyBmcm9tCiAgICBgaHMtc3BlY2lh bC1tb2Rlcy1hbGlzdCcuCiAgICAoaHMtZmluZC1uZXh0LWJsb2NrKTogTmV3IGZ1bmN0aW9uLgog ICAgKE1pc2MuKTogVXBkYXRlIGNhbGxlcnMgb2YgdGhlIGFib3ZlIGZ1bmN0aW9ucy4KICAgIAog ICAgKiB0ZXN0L2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LXRlc3RzLmVsOiBOZXcgdGVzdCBmaWxl IChidWcjNTY2MzUpLgoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL2hpZGVzaG93LmVsIGIv bGlzcC9wcm9nbW9kZXMvaGlkZXNob3cuZWwKaW5kZXggZjU3NGVjODRmYi4uYzA3OTZmYzJlZSAx MDA2NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvaGlkZXNob3cuZWwKKysrIGIvbGlzcC9wcm9nbW9k ZXMvaGlkZXNob3cuZWwKQEAgLTI2Nyw3ICsyNjcsOSBAQCBocy1zcGVjaWFsLW1vZGVzLWFsaXN0 CiAgICAgKSkKICAgIkFsaXN0IGZvciBpbml0aWFsaXppbmcgdGhlIGhpZGVzaG93IHZhcmlhYmxl cyBmb3IgZGlmZmVyZW50IG1vZGVzLgogRWFjaCBlbGVtZW50IGhhcyB0aGUgZm9ybQotICAoTU9E RSBTVEFSVCBFTkQgQ09NTUVOVC1TVEFSVCBGT1JXQVJELVNFWFAtRlVOQyBBREpVU1QtQkVHLUZV TkMpLgorICAoTU9ERSBTVEFSVCBFTkQgQ09NTUVOVC1TVEFSVCBGT1JXQVJELVNFWFAtRlVOQyBB REpVU1QtQkVHLUZVTkMKKyAgIEZJTkQtQkxPQ0stQkVHSU5OSU5HLUZVTkMgRklORC1ORVhULUJM T0NLLUZVTkMKKyAgIExPT0tJTkctQVQtQkxPQ0stU1RBUlQtUC1GVU5DKS4KIAogSWYgbm9uLW5p bCwgaGlkZXNob3cgd2lsbCB1c2UgdGhlc2UgdmFsdWVzIGFzIHJlZ2V4cHMgdG8gZGVmaW5lIGJs b2NrcwogYW5kIGNvbW1lbnRzLCByZXNwZWN0aXZlbHkgZm9yIG1ham9yIG1vZGUgTU9ERS4KQEAg LTI4OCw2ICsyOTAsMTUgQEAgaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdAogU2VlIHRoZSBkb2N1bWVu dGF0aW9uIGZvciBgaHMtYWRqdXN0LWJsb2NrLWJlZ2lubmluZycgdG8gc2VlIHdoYXQgaXMgdGhl CiB1c2Ugb2YgQURKVVNULUJFRy1GVU5DLgogCitTZWUgdGhlIGRvY3VtZW50YXRpb24gZm9yIGBo cy1maW5kLWJsb2NrLWJlZ2lubmluZy1mdW5jJyB0byBzZWUKK3doYXQgaXMgdGhlIHVzZSBvZiBG SU5ELUJMT0NLLUJFR0lOTklORy1GVU5DLgorCitTZWUgdGhlIGRvY3VtZW50YXRpb24gZm9yIGBo cy1maW5kLW5leHQtYmxvY2stZnVuYycgdG8gc2VlIHdoYXQKK2lzIHRoZSB1c2Ugb2YgRklORC1O RVhULUJMT0NLLUZVTkMuCisKK1NlZSB0aGUgZG9jdW1lbnRhdGlvbiBmb3IgYGhzLWxvb2tpbmct YXQtYmxvY2stc3RhcnQtcC1mdW5jJyB0bworc2VlIHdoYXQgaXMgdGhlIHVzZSBvZiBMT09LSU5H LUFULUJMT0NLLVNUQVJULVAtRlVOQy4KKwogSWYgYW55IG9mIHRoZSBlbGVtZW50cyBpcyBsZWZ0 IG5pbCBvciBvbWl0dGVkLCBoaWRlc2hvdyB0cmllcyB0byBndWVzcwogYXBwcm9wcmlhdGUgdmFs dWVzLiAgVGhlIHJlZ2V4cHMgc2hvdWxkIG5vdCBjb250YWluIGxlYWRpbmcgb3IgdHJhaWxpbmcK IHdoaXRlc3BhY2UuICBDYXNlIGRvZXMgbm90IG1hdHRlci4iKQpAQCAtNDMzLDYgKzQ0NCwzOSBA QCBocy1hZGp1c3QtYmxvY2stYmVnaW5uaW5nCiAKIFNlZSBgaHMtYy1saWtlLWFkanVzdC1ibG9j ay1iZWdpbm5pbmcnIGZvciBhbiBleGFtcGxlIG9mIHVzaW5nIHRoaXMuIikKIAorKGRlZnZhci1s b2NhbCBocy1maW5kLWJsb2NrLWJlZ2lubmluZy1mdW5jICMnaHMtZmluZC1ibG9jay1iZWdpbm5p bmcKKyAgIkZ1bmN0aW9uIHVzZWQgdG8gZG8gYGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nJy4KK0l0 IHNob3VsZCByZXBvc2l0aW9uIHBvaW50IGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlIGN1cnJlbnQg YmxvY2sKK2FuZCByZXR1cm4gcG9pbnQsIG9yIG5pbCBpZiBvcmlnaW5hbCBwb2ludCB3YXMgbm90 IGluIGEgYmxvY2suCisKK1NwZWNpZnlpbmcgdGhpcyBmdW5jdGlvbiBpcyBuZWNlc3NhcnkgZm9y IGxhbmd1YWdlcyBzdWNoIGFzCitQeXRob24sIHdoZXJlIHJlZ2V4cCBzZWFyY2ggYW5kIGBzeW50 YXgtcHBzcycgY2hlY2sgaXMgbm90IGVub3VnaAordG8gZmluZCB0aGUgYmVnaW5uaW5nIG9mIHRo ZSBjdXJyZW50IGJsb2NrLiIpCisKKyhkZWZ2YXItbG9jYWwgaHMtZmluZC1uZXh0LWJsb2NrLWZ1 bmMgIydocy1maW5kLW5leHQtYmxvY2sKKyAgIkZ1bmN0aW9uIHVzZWQgdG8gZG8gYGhzLWZpbmQt bmV4dC1ibG9jaycuCitJdCBzaG91bGQgcmVwb3NpdGlvbiBwb2ludCBhdCBuZXh0IGJsb2NrIHN0 YXJ0LgorCitJdCBpcyBjYWxsZWQgd2l0aCB0aHJlZSBhcmd1bWVudHMgUkVHRVhQLCBNQVhQLCBh bmQgQ09NTUVOVFMuCitSRUdFWFAgaXMgYSByZWdleHAgcmVwcmVzZW50aW5nIGJsb2NrIHN0YXJ0 LiAgV2hlbiBibG9jayBzdGFydCBpcworZm91bmQsIGBtYXRjaC1kYXRhJyBzaG91bGQgYmUgc2V0 IHVzaW5nIFJFR0VYUC4gIE1BWFAgaXMgYSBidWZmZXIKK3Bvc2l0aW9uIHRoYXQgYm91bmRzIHRo ZSBzZWFyY2guICBXaGVuIENPTU1FTlRTIGlzIG5pbCwgY29tbWVudHMKK3Nob3VsZCBiZSBza2lw cGVkLiAgV2hlbiBDT01NRU5UUyBpcyBub3QgbmlsLCBSRUdFWFAgbWF0Y2hlcyBub3QKK29ubHkg YmVnaW5uaW5nIG9mIGEgYmxvY2sgYnV0IGFsc28gYmVnaW5uaW5nIG9mIGEgY29tbWVudC4gIElu Cit0aGlzIGNhc2UsIHRoZSBmdW5jdGlvbiBzaG91bGQgZmluZCBuZWFyZXN0IGJsb2NrIG9yIGNv bW1lbnQuCisKK1NwZWNpZnlpbmcgdGhpcyBmdW5jdGlvbiBpcyBuZWNlc3NhcnkgZm9yIGxhbmd1 YWdlcyBzdWNoIGFzCitQeXRob24sIHdoZXJlIHJlZ2V4cCBzZWFyY2ggaXMgbm90IGVub3VnaCB0 byBmaW5kIHRoZSBiZWdpbm5pbmcKK29mIHRoZSBuZXh0IGJsb2NrLiIpCisKKyhkZWZ2YXItbG9j YWwgaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wLWZ1bmMgIydocy1sb29raW5nLWF0LWJsb2Nr LXN0YXJ0LXAKKyAgIkZ1bmN0aW9uIHVzZWQgdG8gZG8gYGhzLWxvb2tpbmctYXQtYmxvY2stc3Rh cnQtcCcuCitJdCBzaG91bGQgcmV0dXJuIG5vbi1uaWwgaWYgdGhlIHBvaW50IGlzIGF0IHRoZSBi bG9jayBzdGFydC4KKworU3BlY2lmeWluZyB0aGlzIGZ1bmN0aW9uIGlzIG5lY2Vzc2FyeSBmb3Ig bGFuZ3VhZ2VzIHN1Y2ggYXMKK1B5dGhvbiwgd2hlcmUgYGxvb2tpbmctYXQnIGFuZCBgc3ludGF4 LXBwc3MnIGNoZWNrIGlzIG5vdCBlbm91Z2gKK3RvIGNoZWNrIGlmIHRoZSBwb2ludCBpcyBhdCB0 aGUgYmxvY2sgc3RhcnQuIikKKwogKGRlZnZhciBocy1oZWFkbGluZSBuaWwKICAgIlRleHQgb2Yg dGhlIGxpbmUgd2hlcmUgYSBoaWRkZW4gYmxvY2sgYmVnaW5zLCBzZXQgZHVyaW5nIGlzZWFyY2gu CiBZb3UgY2FuIGRpc3BsYXkgdGhpcyBpbiB0aGUgbW9kZSBsaW5lIGJ5IGFkZGluZyB0aGUgc3lt Ym9sIGBocy1oZWFkbGluZScKQEAgLTU2NSw3ICs2MDksNyBAQCBocy1oaWRlLWJsb2NrLWF0LXBv aW50CiBhbmQgdGhlbiBmdXJ0aGVyIGFkanVzdGVkIHRvIGJlIGF0IHRoZSBlbmQgb2YgdGhlIGxp bmUuIgogICAoaWYgY29tbWVudC1yZWcKICAgICAgIChocy1oaWRlLWNvbW1lbnQtcmVnaW9uIChj YXIgY29tbWVudC1yZWcpIChjYWRyIGNvbW1lbnQtcmVnKSBlbmQpCi0gICAgKHdoZW4gKGhzLWxv b2tpbmctYXQtYmxvY2stc3RhcnQtcCkKKyAgICAod2hlbiAoZnVuY2FsbCBocy1sb29raW5nLWF0 LWJsb2NrLXN0YXJ0LXAtZnVuYykKICAgICAgIChsZXQgKChtZGF0YSAobWF0Y2gtZGF0YSB0KSkK ICAgICAgICAgICAgIChoZWFkZXItZW5kIChtYXRjaC1lbmQgMCkpCiAgICAgICAgICAgICBwIHEg b3YpCkBAIC02NzIsNyArNzE2LDE0IEBAIGhzLWdyb2stbW9kZS10eXBlCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAgKDEtIChtYXRjaC1lbmQg MCkpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGMtc3RhcnQtcmVn ZXhwKSkpCiAgICAgICAgICAgICAgIGhzLWZvcndhcmQtc2V4cC1mdW5jIChvciAobnRoIDQgbG9v a3VwKSAjJ2ZvcndhcmQtc2V4cCkKLSAgICAgICAgICAgICAgaHMtYWRqdXN0LWJsb2NrLWJlZ2lu bmluZyAob3IgKG50aCA1IGxvb2t1cCkgIydpZGVudGl0eSkpKQorICAgICAgICAgICAgICBocy1h ZGp1c3QtYmxvY2stYmVnaW5uaW5nIChvciAobnRoIDUgbG9va3VwKSAjJ2lkZW50aXR5KQorICAg ICAgICAgICAgICBocy1maW5kLWJsb2NrLWJlZ2lubmluZy1mdW5jIChvciAobnRoIDYgbG9va3Vw KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjJ2hzLWZp bmQtYmxvY2stYmVnaW5uaW5nKQorICAgICAgICAgICAgICBocy1maW5kLW5leHQtYmxvY2stZnVu YyAob3IgKG50aCA3IGxvb2t1cCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICMnaHMtZmluZC1uZXh0LWJsb2NrKQorICAgICAgICAgICAgICBocy1sb29raW5nLWF0 LWJsb2NrLXN0YXJ0LXAtZnVuYworICAgICAgICAgICAgICAob3IgKG50aCA4IGxvb2t1cCkKKyAg ICAgICAgICAgICAgICAgICMnaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wKSkpCiAgICAgKHNl dHEgaHMtbWlub3ItbW9kZSBuaWwpCiAgICAgKGVycm9yICIlcyBNb2RlIGRvZXNuJ3Qgc3VwcG9y dCBIaWRlc2hvdyBNaW5vciBNb2RlIgogICAgICAgICAgICAoZm9ybWF0LW1vZGUtbGluZSBtb2Rl LW5hbWUpKSkpCkBAIC02ODMsNyArNzM0LDcgQEAgaHMtZmluZC1ibG9jay1iZWdpbm5pbmcKICAg KGxldCAoKGRvbmUgbmlsKQogICAgICAgICAoaGVyZSAocG9pbnQpKSkKICAgICA7OyBsb29rIGlm IGN1cnJlbnQgbGluZSBpcyBibG9jayBzdGFydAotICAgIChpZiAoaHMtbG9va2luZy1hdC1ibG9j ay1zdGFydC1wKQorICAgIChpZiAoZnVuY2FsbCBocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXAt ZnVuYykKICAgICAgICAgKHBvaW50KQogICAgICAgOzsgbG9vayBiYWNrd2FyZCBmb3IgdGhlIHN0 YXJ0IG9mIGEgYmxvY2sgdGhhdCBjb250YWlucyB0aGUgY3Vyc29yCiAgICAgICAod2hpbGUgKGFu ZCAocmUtc2VhcmNoLWJhY2t3YXJkIGhzLWJsb2NrLXN0YXJ0LXJlZ2V4cCBuaWwgdCkKQEAgLTY5 OCwxOSArNzQ5LDI1IEBAIGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nCiAgICAgICAgIChnb3RvLWNo YXIgaGVyZSkKICAgICAgICAgbmlsKSkpKQogCisoZGVmdW4gaHMtZmluZC1uZXh0LWJsb2NrIChy ZWdleHAgbWF4cCBjb21tZW50cykKKyAgIlJlcG9zaXRpb24gcG9pbnQgYXQgbmV4dCBibG9jay1z dGFydC4KK1NraXAgY29tbWVudHMgaWYgQ09NTUVOVFMgaXMgbmlsLCBhbmQgc2VhcmNoIGZvciBS RUdFWFAgaW4KK3JlZ2lvbiAocG9pbnQgTUFYUCkuIgorICAod2hlbiAobm90IGNvbW1lbnRzKQor ICAgIChmb3J3YXJkLWNvbW1lbnQgKHBvaW50LW1heCkpKQorICAoYW5kICg8IChwb2ludCkgbWF4 cCkKKyAgICAgICAocmUtc2VhcmNoLWZvcndhcmQgcmVnZXhwIG1heHAgdCkpKQorCiAoZGVmdW4g aHMtaGlkZS1sZXZlbC1yZWN1cnNpdmUgKGFyZyBtaW5wIG1heHApCiAgICJSZWN1cnNpdmVseSBo aWRlIGJsb2NrcyBBUkcgbGV2ZWxzIGJlbG93IHBvaW50IGluIHJlZ2lvbiAoTUlOUCBNQVhQKS4i Ci0gICh3aGVuIChocy1maW5kLWJsb2NrLWJlZ2lubmluZykKKyAgKHdoZW4gKGZ1bmNhbGwgaHMt ZmluZC1ibG9jay1iZWdpbm5pbmctZnVuYykKICAgICAoc2V0cSBtaW5wICgxKyAocG9pbnQpKSkK ICAgICAoZnVuY2FsbCBocy1mb3J3YXJkLXNleHAtZnVuYyAxKQogICAgIChzZXRxIG1heHAgKDEt IChwb2ludCkpKSkKICAgKHVubGVzcyBocy1hbGxvdy1uZXN0aW5nCiAgICAgKGhzLWRpc2NhcmQt b3ZlcmxheXMgbWlucCBtYXhwKSkKICAgKGdvdG8tY2hhciBtaW5wKQotICAod2hpbGUgKHByb2du Ci0gICAgICAgICAgIChmb3J3YXJkLWNvbW1lbnQgKGJ1ZmZlci1zaXplKSkKLSAgICAgICAgICAg KGFuZCAoPCAocG9pbnQpIG1heHApCi0gICAgICAgICAgICAgICAgKHJlLXNlYXJjaC1mb3J3YXJk IGhzLWJsb2NrLXN0YXJ0LXJlZ2V4cCBtYXhwIHQpKSkKKyAgKHdoaWxlIChmdW5jYWxsIGhzLWZp bmQtbmV4dC1ibG9jay1mdW5jIGhzLWJsb2NrLXN0YXJ0LXJlZ2V4cCBtYXhwIG5pbCkKICAgICAo d2hlbiAoc2F2ZS1tYXRjaC1kYXRhCiAJICAgIChub3QgKG50aCA4IChzeW50YXgtcHBzcykpKSkg OyBub3QgaW5zaWRlIGNvbW1lbnRzIG9yIHN0cmluZ3MKICAgICAgIChpZiAoPiBhcmcgMSkKQEAg LTc0Nyw4ICs4MDQsOCBAQCBocy1hbHJlYWR5LWhpZGRlbi1wCiAgICAgICAgICAgKGdvdG8tY2hh ciAobnRoIDAgYy1yZWcpKQogICAgICAgICAoZW5kLW9mLWxpbmUpCiAgICAgICAgICh3aGVuIChh bmQgKG5vdCBjLXJlZykKLSAgICAgICAgICAgICAgICAgICAoaHMtZmluZC1ibG9jay1iZWdpbm5p bmcpCi0JCSAgIChocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXApKQorICAgICAgICAgICAgICAg ICAgIChmdW5jYWxsIGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nLWZ1bmMpCisJCSAgIChmdW5jYWxs IGhzLWxvb2tpbmctYXQtYmxvY2stc3RhcnQtcC1mdW5jKSkKICAgICAgICAgICA7OyBwb2ludCBp cyBpbnNpZGUgYSBibG9jawogICAgICAgICAgIChnb3RvLWNoYXIgKG1hdGNoLWVuZCAwKSkpKSkK ICAgICAoZW5kLW9mLWxpbmUpCkBAIC03OTAsMTAgKzg0Nyw4IEBAIGhzLWhpZGUtYWxsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhzLWMtc3RhcnQtcmVnZXhwCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJcXCkiKQogICAgICAgICAgICAgICAgICAgICAg ICAgICIiKSkpKQotICAgICAgICh3aGlsZSAocHJvZ24KLSAgICAgICAgICAgICAgICAodW5sZXNz IGhzLWhpZGUtY29tbWVudHMtd2hlbi1oaWRpbmctYWxsCi0gICAgICAgICAgICAgICAgICAoZm9y d2FyZC1jb21tZW50IChwb2ludC1tYXgpKSkKLSAgICAgICAgICAgICAgICAocmUtc2VhcmNoLWZv cndhcmQgcmUgKHBvaW50LW1heCkgdCkpCisgICAgICAgKHdoaWxlIChmdW5jYWxsIGhzLWZpbmQt bmV4dC1ibG9jay1mdW5jIHJlIChwb2ludC1tYXgpCisgICAgICAgICAgICAgICAgICAgICAgIGhz LWhpZGUtY29tbWVudHMtd2hlbi1oaWRpbmctYWxsKQogICAgICAgICAgKGlmIChtYXRjaC1iZWdp bm5pbmcgMSkKICAgICAgICAgICAgICA7OyBXZSBoYXZlIGZvdW5kIGEgYmxvY2sgYmVnaW5uaW5n LgogICAgICAgICAgICAgIChwcm9nbgpAQCAtODM4LDggKzg5Myw4IEBAIGhzLWhpZGUtYmxvY2sK ICAgICAgICAgICAgICAgICAgICAgICAoPD0gKGNvdW50LWxpbmVzIChjYXIgYy1yZWcpIChudGgg MSBjLXJlZykpIDEpKSkKICAgICAgICAobWVzc2FnZSAiKG5vdCBlbm91Z2ggY29tbWVudCBsaW5l cyB0byBoaWRlKSIpKQogICAgICAgKChvciBjLXJlZwotCSAgIChocy1sb29raW5nLWF0LWJsb2Nr LXN0YXJ0LXApCi0gICAgICAgICAgIChocy1maW5kLWJsb2NrLWJlZ2lubmluZykpCisJICAgKGZ1 bmNhbGwgaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1wLWZ1bmMpCisgICAgICAgICAgIChmdW5j YWxsIGhzLWZpbmQtYmxvY2stYmVnaW5uaW5nLWZ1bmMpKQogICAgICAgIChocy1oaWRlLWJsb2Nr LWF0LXBvaW50IGVuZCBjLXJlZykKICAgICAgICAocnVuLWhvb2tzICdocy1oaWRlLWhvb2spKSkp KSkKIApAQCAtODY4LDkgKzkyMyw5IEBAIGhzLXNob3ctYmxvY2sKICAgICAgICAgICAgICAod2hl biAoY2FyIGMtcmVnKQogICAgICAgICAgICAgICAgKHNldHEgcCAoY2FyIGMtcmVnKQogICAgICAg ICAgICAgICAgICAgICAgcSAoY2FkciBjLXJlZykpKSkKLSAgICAgICAgICAgICgoYW5kIChocy1m aW5kLWJsb2NrLWJlZ2lubmluZykKKyAgICAgICAgICAgICgoYW5kIChmdW5jYWxsIGhzLWZpbmQt YmxvY2stYmVnaW5uaW5nLWZ1bmMpCiAgICAgICAgICAgICAgICAgICA7OyB1Z2gsIGZyZXNoIG1h dGNoLWRhdGEKLSAgICAgICAgICAgICAgICAgIChocy1sb29raW5nLWF0LWJsb2NrLXN0YXJ0LXAp KQorICAgICAgICAgICAgICAgICAgKGZ1bmNhbGwgaHMtbG9va2luZy1hdC1ibG9jay1zdGFydC1w LWZ1bmMpKQogICAgICAgICAgICAgIChzZXRxIHAgKHBvaW50KQogICAgICAgICAgICAgICAgICAg IHEgKHByb2duIChocy1mb3J3YXJkLXNleHAgKG1hdGNoLWRhdGEgdCkgMSkgKHBvaW50KSkpKSkK ICAgICAgICh3aGVuIChhbmQgcCBxKQpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL3Byb2dtb2Rlcy9o aWRlc2hvdy10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvaGlkZXNob3ctdGVzdHMuZWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMC4uZWUyYTBjN2M0YwotLS0gL2Rl di9udWxsCisrKyBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvaGlkZXNob3ctdGVzdHMuZWwKQEAgLTAs MCArMSwyNjggQEAKKzs7OyBoaWRlc2hvdy10ZXN0cy5lbCAtLS0gVGVzdCBzdWl0ZSBmb3IgaGlk ZXNob3cuZWwgIC0qLSBsZXhpY2FsLWJpbmRpbmc6dCAtKi0KKworOzsgQ29weXJpZ2h0IChDKSAy MDIyIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgorCis7OyBUaGlzIGZpbGUgaXMgcGFy dCBvZiBHTlUgRW1hY3MuCisKKzs7IEdOVSBFbWFjcyBpcyBmcmVlIHNvZnR3YXJlOiB5b3UgY2Fu IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5Cis7OyBpdCB1bmRlciB0aGUgdGVybXMgb2Yg dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzsgdGhlIEZy ZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgZWl0aGVyIHZlcnNpb24gMyBvZiB0aGUgTGljZW5zZSwg b3IKKzs7IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisKKzs7IEdOVSBFbWFj cyBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorOzsg YnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFu dHkgb2YKKzs7IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVS UE9TRS4gIFNlZSB0aGUKKzs7IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRl dGFpbHMuCisKKzs7IFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBH ZW5lcmFsIFB1YmxpYyBMaWNlbnNlCis7OyBhbG9uZyB3aXRoIEdOVSBFbWFjcy4gIElmIG5vdCwg c2VlIDxodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCisKKzs7OyBDb21tZW50YXJ5Ogor Cis7OzsgQ29kZToKKworKHJlcXVpcmUgJ2VydCkKKyhyZXF1aXJlICdlcnQteCkKKyhyZXF1aXJl ICdoaWRlc2hvdykKKworOzsgRGVwZW5kZW5jaWVzIGZvciB0ZXN0aW5nOgorKHJlcXVpcmUgJ2Nj LW1vZGUpCisKKworKGRlZm1hY3JvIGhpZGVzaG93LXRlc3RzLXdpdGgtdGVtcC1idWZmZXIgKG1v ZGUgY29udGVudHMgJnJlc3QgYm9keSkKKyAgIkNyZWF0ZSBhIGBocy1taW5vci1tb2RlJyBlbmFi bGVkIE1PREUgdGVtcCBidWZmZXIgd2l0aCBDT05URU5UUy4KK0JPRFkgaXMgY29kZSB0byBiZSBl eGVjdXRlZCB3aXRoaW4gdGhlIHRlbXAgYnVmZmVyLiAgUG9pbnQgaXMKK2Fsd2F5cyBsb2NhdGVk IGF0IHRoZSBiZWdpbm5pbmcgb2YgYnVmZmVyLiIKKyAgKGRlY2xhcmUgKGluZGVudCAxKSAoZGVi dWcgdCkpCisgIGAod2l0aC10ZW1wLWJ1ZmZlcgorICAgICAoLG1vZGUpCisgICAgIChocy1taW5v ci1tb2RlIDEpCisgICAgIChpbnNlcnQgLGNvbnRlbnRzKQorICAgICAoZ290by1jaGFyIChwb2lu dC1taW4pKQorICAgICAsQGJvZHkpKQorCisoZGVmdW4gaGlkZXNob3ctdGVzdHMtbG9vay1hdCAo c3RyaW5nICZvcHRpb25hbCBudW0gcmVzdG9yZS1wb2ludCkKKyAgIk1vdmUgcG9pbnQgYXQgYmVn aW5uaW5nIG9mIFNUUklORyBpbiB0aGUgY3VycmVudCBidWZmZXIuCitPcHRpb25hbCBhcmd1bWVu dCBOVU0gZGVmYXVsdHMgdG8gMSBhbmQgaXMgYW4gaW50ZWdlciBpbmRpY2F0aW5nCitob3cgbWFu eSBvY2N1cnJlbmNlcyBtdXN0IGJlIGZvdW5kLCB3aGVuIHBvc2l0aXZlIHRoZSBzZWFyY2ggaXMK K2RvbmUgZm9yd2FyZHMsIG90aGVyd2lzZSBiYWNrd2FyZHMuICBXaGVuIFJFU1RPUkUtUE9JTlQg aXMKK25vbi1uaWwgdGhlIHBvaW50IGlzIG5vdCBtb3ZlZCBidXQgdGhlIHBvc2l0aW9uIGZvdW5k IGlzIHN0aWxsCityZXR1cm5lZC4gIFdoZW4gc2VhcmNoaW5nIGZvcndhcmQgYW5kIHBvaW50IGlz IGFscmVhZHkgbG9va2luZyBhdAorU1RSSU5HLCBpdCBpcyBza2lwcGVkIHNvIHRoZSBuZXh0IFNU UklORyBvY2N1cnJlbmNlIGlzIHNlbGVjdGVkLiIKKyAgKGxldCogKChudW0gKG9yIG51bSAxKSkK KyAgICAgICAgIChzdGFydGluZy1wb2ludCAocG9pbnQpKQorICAgICAgICAgKHN0cmluZyAocmVn ZXhwLXF1b3RlIHN0cmluZykpCisgICAgICAgICAoc2VhcmNoLWZuIChpZiAoPiBudW0gMCkgIydy ZS1zZWFyY2gtZm9yd2FyZCAjJ3JlLXNlYXJjaC1iYWNrd2FyZCkpCisgICAgICAgICAoZGVpbmMt Zm4gKGlmICg+IG51bSAwKSAjJzEtICMnMSspKQorICAgICAgICAgKGZvdW5kLXBvaW50KSkKKyAg ICAocHJvZzIKKyAgICAgICAgKGNhdGNoICdleGl0CisgICAgICAgICAgKHdoaWxlIChub3QgKD0g bnVtIDApKQorICAgICAgICAgICAgKHdoZW4gKGFuZCAoPiBudW0gMCkKKyAgICAgICAgICAgICAg ICAgICAgICAgKGxvb2tpbmctYXQgc3RyaW5nKSkKKyAgICAgICAgICAgICAgOzsgTW92aW5nIGZv cndhcmQgYW5kIGFscmVhZHkgbG9va2luZyBhdCBTVFJJTkcsIHNraXAgaXQuCisgICAgICAgICAg ICAgIChmb3J3YXJkLWNoYXIgKGxlbmd0aCAobWF0Y2gtc3RyaW5nLW5vLXByb3BlcnRpZXMgMCkp KSkKKyAgICAgICAgICAgIChhbmQgKG5vdCAoZnVuY2FsbCBzZWFyY2gtZm4gc3RyaW5nIG5pbCB0 KSkKKyAgICAgICAgICAgICAgICAgKHRocm93ICdleGl0IHQpKQorICAgICAgICAgICAgKHdoZW4g KD4gbnVtIDApCisgICAgICAgICAgICAgIDs7IGByZS1zZWFyY2gtZm9yd2FyZCcgbGVhdmVzIHBv aW50IGF0IHRoZSBlbmQgb2YgdGhlCisgICAgICAgICAgICAgIDs7IG9jY3VycmVuY2UsIG1vdmUg YmFjayBzbyBwb2ludCBpcyBhdCB0aGUgYmVnaW5uaW5nCisgICAgICAgICAgICAgIDs7IGluc3Rl YWQuCisgICAgICAgICAgICAgIChmb3J3YXJkLWNoYXIgKC0gKGxlbmd0aCAobWF0Y2gtc3RyaW5n LW5vLXByb3BlcnRpZXMgMCkpKSkpCisgICAgICAgICAgICAoc2V0cQorICAgICAgICAgICAgIG51 bSAoZnVuY2FsbCBkZWluYy1mbiBudW0pCisgICAgICAgICAgICAgZm91bmQtcG9pbnQgKHBvaW50 KSkpKQorICAgICAgICBmb3VuZC1wb2ludAorICAgICAgKGFuZCByZXN0b3JlLXBvaW50IChnb3Rv LWNoYXIgc3RhcnRpbmctcG9pbnQpKSkpKQorCisoZGVmdW4gaGlkZXNob3ctdGVzdHMtdmlzaWJs ZS1zdHJpbmcgKCZvcHRpb25hbCBtaW4gbWF4KQorICAiUmV0dXJuIHRoZSBidWZmZXIgc3RyaW5n IGV4Y2x1ZGluZyBpbnZpc2libGUgb3ZlcmxheXMuCitBcmd1bWVudCBNSU4gYW5kIE1BWCBkZWxp bWl0IHRoZSByZWdpb24gdG8gYmUgcmV0dXJuZWQgYW5kCitkZWZhdWx0IHRvIGBwb2ludC1taW4n IGFuZCBgcG9pbnQtbWF4JyByZXNwZWN0aXZlbHkuIgorICAobGV0KiAoKG1pbiAob3IgbWluIChw b2ludC1taW4pKSkKKyAgICAgICAgIChtYXggKG9yIG1heCAocG9pbnQtbWF4KSkpCisgICAgICAg ICAoYnVmZmVyLWNvbnRlbnRzIChidWZmZXItc3Vic3RyaW5nLW5vLXByb3BlcnRpZXMgbWluIG1h eCkpCisgICAgICAgICAob3ZlcmxheXMKKyAgICAgICAgICAoc29ydCAob3ZlcmxheXMtaW4gbWlu IG1heCkKKyAgICAgICAgICAgICAgICAobGFtYmRhIChhIGIpCisgICAgICAgICAgICAgICAgICAo bGV0ICgob3ZlcmxheS1lbmQtYSAob3ZlcmxheS1lbmQgYSkpCisgICAgICAgICAgICAgICAgICAg ICAgICAob3ZlcmxheS1lbmQtYiAob3ZlcmxheS1lbmQgYikpKQorICAgICAgICAgICAgICAgICAg ICAoPiBvdmVybGF5LWVuZC1hIG92ZXJsYXktZW5kLWIpKSkpKSkKKyAgICAod2l0aC10ZW1wLWJ1 ZmZlcgorICAgICAgKGluc2VydCBidWZmZXItY29udGVudHMpCisgICAgICAoZG9saXN0IChvdmVy bGF5IG92ZXJsYXlzKQorICAgICAgICAoaWYgKG92ZXJsYXktZ2V0IG92ZXJsYXkgJ2ludmlzaWJs ZSkKKyAgICAgICAgICAgIChkZWxldGUtcmVnaW9uIChvdmVybGF5LXN0YXJ0IG92ZXJsYXkpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAob3ZlcmxheS1lbmQgb3ZlcmxheSkpKSkKKyAgICAg IChidWZmZXItc3Vic3RyaW5nLW5vLXByb3BlcnRpZXMgKHBvaW50LW1pbikgKHBvaW50LW1heCkp KSkpCisKKyhlcnQtZGVmdGVzdCBoaWRlc2hvdy1oaWRlLWJsb2NrLTEgKCkKKyAgIlNob3VsZCBo aWRlIGN1cnJlbnQgYmxvY2suIgorICAobGV0ICgoY29udGVudHMgIgoraW50CittYWluKCkKK3sK KyAgcHJpbnRmKFwiSGVsbG9cXG5cIik7Cit9CisiKSkKKyAgICAoaGlkZXNob3ctdGVzdHMtd2l0 aC10ZW1wLWJ1ZmZlcgorICAgICBjLW1vZGUKKyAgICAgY29udGVudHMKKyAgICAgKGhpZGVzaG93 LXRlc3RzLWxvb2stYXQgInByaW50ZiIpCisgICAgIChocy1oaWRlLWJsb2NrKQorICAgICAoc2hv dWxkIChzdHJpbmc9CisgICAgICAgICAgICAgIChoaWRlc2hvdy10ZXN0cy12aXNpYmxlLXN0cmlu ZykKKyAgICAgICAgICAgICAgIgoraW50CittYWluKCkKK3t9CisiKSkKKyAgICAgKGhzLXNob3ct YmxvY2spCisgICAgIChzaG91bGQgKHN0cmluZz0gKGhpZGVzaG93LXRlc3RzLXZpc2libGUtc3Ry aW5nKSBjb250ZW50cykpKSkpCisKKyhlcnQtZGVmdGVzdCBoaWRlc2hvdy1oaWRlLWFsbC0xICgp CisgICJTaG91bGQgaGlkZSBhbGwgYmxvY2tzIGFuZCBjb21tZW50cy4iCisgIChsZXQgKChjb250 ZW50cyAiCisvKgorICAgQ29tbWVudHMKKyovCisKK2ludAorbWFpbigpCit7CisgIHN1YigpOwor fQorCit2b2lkCitzdWIoKQoreworICBwcmludGYoXCJIZWxsb1xcblwiKTsKK30KKyIpKQorICAg IChoaWRlc2hvdy10ZXN0cy13aXRoLXRlbXAtYnVmZmVyCisgICAgIGMtbW9kZQorICAgICBjb250 ZW50cworICAgICAoaHMtaGlkZS1hbGwpCisgICAgIChzaG91bGQgKHN0cmluZz0KKyAgICAgICAg ICAgICAgKGhpZGVzaG93LXRlc3RzLXZpc2libGUtc3RyaW5nKQorICAgICAgICAgICAgICAiCisv KgorCitpbnQKK21haW4oKQore30KKwordm9pZAorc3ViKCkKK3t9CisiKSkKKyAgICAgKGhzLXNo b3ctYWxsKQorICAgICAoc2hvdWxkIChzdHJpbmc9IChoaWRlc2hvdy10ZXN0cy12aXNpYmxlLXN0 cmluZykgY29udGVudHMpKSkpKQorCisoZXJ0LWRlZnRlc3QgaGlkZXNob3ctaGlkZS1hbGwtMiAo KQorICAiU2hvdWxkIG5vdCBoaWRlIGNvbW1lbnRzIHdoZW4gYGhzLWhpZGUtY29tbWVudHMtd2hl bi1oaWRpbmctYWxsJyBpcyBuaWwuIgorICAobGV0ICgoY29udGVudHMgIgorLyoKKyAgIENvbW1l bnRzCisqLworCitpbnQKK21haW4oKQoreworICBzdWIoKTsKK30KKwordm9pZAorc3ViKCkKK3sK KyAgcHJpbnRmKFwiSGVsbG9cXG5cIik7Cit9CisiKSkKKyAgICAoaGlkZXNob3ctdGVzdHMtd2l0 aC10ZW1wLWJ1ZmZlcgorICAgICBjLW1vZGUKKyAgICAgY29udGVudHMKKyAgICAgKGxldCAoKGhz LWhpZGUtY29tbWVudHMtd2hlbi1oaWRpbmctYWxsIG5pbCkpCisgICAgICAgKGhzLWhpZGUtYWxs KSkKKyAgICAgKHNob3VsZCAoc3RyaW5nPQorICAgICAgICAgICAgICAoaGlkZXNob3ctdGVzdHMt dmlzaWJsZS1zdHJpbmcpCisgICAgICAgICAgICAgICIKKy8qCisgICBDb21tZW50cworKi8KKwor aW50CittYWluKCkKK3t9CisKK3ZvaWQKK3N1YigpCit7fQorIikpCisgICAgIChocy1zaG93LWFs bCkKKyAgICAgKHNob3VsZCAoc3RyaW5nPSAoaGlkZXNob3ctdGVzdHMtdmlzaWJsZS1zdHJpbmcp IGNvbnRlbnRzKSkpKSkKKworKGVydC1kZWZ0ZXN0IGhpZGVzaG93LWhpZGUtbGV2ZWwtMSAoKQor ICAiU2hvdWxkIGhpZGUgMXN0IGxldmVsIGJsb2Nrcy4iCisgIChoaWRlc2hvdy10ZXN0cy13aXRo LXRlbXAtYnVmZmVyCisgICBjLW1vZGUKKyAgICIKKy8qCisgICBDb21tZW50cworKi8KKworaW50 CittYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKK3sKKyAgaWYgKGFyZ2MgPiAxKSB7CisgICAg cHJpbnRmKFwiSGVsbG9cXG5cIik7CisgIH0KK30KKyIKKyAgIChocy1oaWRlLWxldmVsIDEpCisg ICAoc2hvdWxkIChzdHJpbmc9CisgICAgICAgICAgICAoaGlkZXNob3ctdGVzdHMtdmlzaWJsZS1z dHJpbmcpCisgICAgICAgICAgICAiCisvKgorICAgQ29tbWVudHMKKyovCisKK2ludAorbWFpbihp bnQgYXJnYywgY2hhciAqKmFyZ3YpCit7fQorIikpKSkKKworKGVydC1kZWZ0ZXN0IGhpZGVzaG93 LWhpZGUtbGV2ZWwtMiAoKQorICAiU2hvdWxkIGhpZGUgMm5kIGxldmVsIGJsb2Nrcy4iCisgICho aWRlc2hvdy10ZXN0cy13aXRoLXRlbXAtYnVmZmVyCisgICBjLW1vZGUKKyAgICIKKy8qCisgICBD b21tZW50cworKi8KKworaW50CittYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKK3sKKyAgaWYg KGFyZ2MgPiAxKSB7CisgICAgcHJpbnRmKFwiSGVsbG9cXG5cIik7CisgIH0KK30KKyIKKyAgICho cy1oaWRlLWxldmVsIDIpCisgICAoc2hvdWxkIChzdHJpbmc9CisgICAgICAgICAgICAoaGlkZXNo b3ctdGVzdHMtdmlzaWJsZS1zdHJpbmcpCisgICAgICAgICAgICAiCisvKgorICAgQ29tbWVudHMK KyovCisKK2ludAorbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCit7CisgIGlmIChhcmdjID4g MSkge30KK30KKyIpKSkpCisKKyhwcm92aWRlICdoaWRlc2hvdy10ZXN0cykKKworOzs7IGhpZGVz aG93LXRlc3RzLmVsIGVuZHMgaGVyZQo= --000000000000275b4805e6fd51a5 Content-Type: application/octet-stream; name="2-python.patch" Content-Disposition: attachment; filename="2-python.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l77p40qx1 Y29tbWl0IDFiNzc4ZmUyZTAyMjBiOTQ2ZjBjMWQ3ZTUxMGM0ZDEwZDAzNTE5NzcKQXV0aG9yOiBr b2Jhcml0eSA8a29iYXJpdHlAZ21haWwuY29tPgpEYXRlOiAgIFdlZCBBdWcgMjQgMjI6Mjc6MDkg MjAyMiArMDkwMAoKICAgIEFkZCBQeXRob24gYmxvY2tzIHN1cHBvcnQgZm9yIGhpZGVzaG93CiAg ICAKICAgICogbGlzcC9wcm9nbW9kZXMvcHl0aG9uLmVsIChweXRob24tbmF2LWJlZ2lubmluZy1v Zi1ibG9jay1yZWdleHApOgogICAgTmV3IHZhcmlhYmxlLgogICAgKHB5dGhvbi1oaWRlc2hvdy1m b3J3YXJkLXNleHAtZnVuY3Rpb24pOiBDaGFuZ2UgdG8gY2FsbAogICAgYHB5dGhvbi1uYXYtZW5k LW9mLWJsb2NrJy4KICAgIChweXRob24taGlkZXNob3ctZmluZC1uZXh0LWJsb2NrKTogTmV3IGZ1 bmN0aW9uIHRvIGJlIHVzZWQgYXMKICAgIEZJTkQtTkVYVC1CTE9DSy1GVU5DIGluIGBocy1zcGVj aWFsLW1vZGVzLWFsaXN0Jy4KICAgIChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1v Zi1ibG9jayk6IE5ldyBmdW5jdGlvbiB0byBiZQogICAgdXNlZCBhcyBMT09LSU5HLUFULUJMT0NL LVNUQVJULVAtRlVOQyBpbiBgaHMtc3BlY2lhbC1tb2Rlcy1hbGlzdCcuCiAgICAocHl0aG9uLW1v ZGUpOiBDaGFuZ2Ugc2V0dGluZ3Mgb2YgYGhzLXNwZWNpYWwtbW9kZXMtYWxpc3QnLgogICAgCiAg ICAqIHRlc3QvbGlzcC9wcm9nbW9kZXMvcHl0aG9uLXRlc3RzLmVsCiAgICAocHl0aG9uLWhpZGVz aG93LWhpZGUtbGV2ZWxzLTEpOiBGaXggdG8ga2VlcCBlbXB0eSBsaW5lcy4KICAgIChweXRob24t aW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jay0xKQogICAgKHB5dGhvbi1oaWRlc2hv dy1oaWRlLWxldmVscy0zLCBweXRob24taGlkZXNob3ctaGlkZS1sZXZlbHMtNCkKICAgIChweXRo b24taGlkZXNob3ctaGlkZS1hbGwtMSwgcHl0aG9uLWhpZGVzaG93LWhpZGUtYWxsLTIpCiAgICAo cHl0aG9uLWhpZGVzaG93LWhpZGUtYWxsLTMsIHB5dGhvbi1oaWRlc2hvdy1oaWRlLWJsb2NrLTEp OiBOZXcKICAgIHRlc3RzIChidWcjNTY2MzUpLgoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVz L3B5dGhvbi5lbCBiL2xpc3AvcHJvZ21vZGVzL3B5dGhvbi5lbAppbmRleCBlMTM0Nzc1NGM0Li5k M2ZmYzJkYjJjIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9weXRob24uZWwKKysrIGIvbGlz cC9wcm9nbW9kZXMvcHl0aG9uLmVsCkBAIC0xNTI0LDYgKzE1MjQsMTAgQEAgcHl0aG9uLW5hdi1i ZWdpbm5pbmctb2YtZGVmdW4tcmVnZXhwCiBUaGUgbmFtZSBvZiB0aGUgZGVmdW4gc2hvdWxkIGJl IGdyb3VwZWQgc28gaXQgY2FuIGJlIHJldHJpZXZlZAogdmlhIGBtYXRjaC1zdHJpbmcnLiIpCiAK KyhkZWZ2YXIgcHl0aG9uLW5hdi1iZWdpbm5pbmctb2YtYmxvY2stcmVnZXhwCisgIChweXRob24t cnggbGluZS1zdGFydCAoKiBzcGFjZSkgYmxvY2stc3RhcnQpCisgICJSZWdleHAgbWF0Y2hpbmcg YmxvY2sgc3RhcnQuIikKKwogKGRlZnVuIHB5dGhvbi1uYXYtLWJlZ2lubmluZy1vZi1kZWZ1biAo Jm9wdGlvbmFsIGFyZykKICAgIkludGVybmFsIGltcGxlbWVudGF0aW9uIG9mIGBweXRob24tbmF2 LWJlZ2lubmluZy1vZi1kZWZ1bicuCiBXaXRoIHBvc2l0aXZlIEFSRyBzZWFyY2ggYmFja3dhcmRz LCBlbHNlIHNlYXJjaCBmb3J3YXJkcy4iCkBAIC00OTE2LDkgKzQ5MjAsMzcgQEAgcHl0aG9uLWRl c2NyaWJlLWF0LXBvaW50CiAoZGVmdW4gcHl0aG9uLWhpZGVzaG93LWZvcndhcmQtc2V4cC1mdW5j dGlvbiAoX2FyZykKICAgIlB5dGhvbiBzcGVjaWZpYyBgZm9yd2FyZC1zZXhwJyBmdW5jdGlvbiBm b3IgYGhzLW1pbm9yLW1vZGUnLgogQXJndW1lbnQgQVJHIGlzIGlnbm9yZWQuIgotICAocHl0aG9u LW5hdi1lbmQtb2YtZGVmdW4pCi0gICh1bmxlc3MgKHB5dGhvbi1pbmZvLWN1cnJlbnQtbGluZS1l bXB0eS1wKQotICAgIChiYWNrd2FyZC1jaGFyKSkpCisgIChweXRob24tbmF2LWVuZC1vZi1ibG9j aykpCisKKyhkZWZ1biBweXRob24taGlkZXNob3ctZmluZC1uZXh0LWJsb2NrIChyZWdleHAgbWF4 cCBjb21tZW50cykKKyAgIlB5dGhvbiBzcGVjaWZpYyBgaHMtZmluZC1uZXh0LWJsb2NrJyBmdW5j dGlvbiBmb3IgYGhzLW1pbm9yLW1vZGUnLgorQ2FsbCBgcHl0aG9uLW5hdi1mb3J3YXJkLWJsb2Nr JyB0byBmaW5kIG5leHQgYmxvY2sgYW5kIGNoZWNrIGlmCitibG9jay1zdGFydCBlbmRzIHdpdGhp biBNQVhQLiAgSWYgQ09NTUVOVFMgaXMgbm90IG5pbCwgY29tbWVudHMKK2FyZSBhbHNvIHNlYXJj aGVkLiAgUkVHRVhQIGlzIHBhc3NlZCB0byBgbG9va2luZy1hdCcgdG8gc2V0CitgbWF0Y2gtZGF0 YScuIgorICAobGV0KiAoKG5leHQtYmxvY2sgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAgICAg ICAgICAgICAgIChvciAoYW5kCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHB5dGhvbi1p bmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChyZS1zZWFyY2gtZm9yd2FyZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo cHl0aG9uLXJ4IGJsb2NrLXN0YXJ0KSBtYXhwIHQpKQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGFuZCAocHl0aG9uLW5hdi1mb3J3YXJkLWJsb2NrKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoPCAocG9pbnQpIG1heHApCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIChyZS1zZWFyY2gtZm9yd2FyZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KHB5dGhvbi1yeCBibG9jay1zdGFydCkgbWF4cCB0KSkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICgxKyBtYXhwKSkpKQorICAgICAgICAgKG5leHQtY29tbWVudAorICAgICAgICAgIChvciAo d2hlbiBjb21tZW50cworICAgICAgICAgICAgICAgIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAg ICAgICAgICAgKGNsLWxvb3Agd2hpbGUgKHJlLXNlYXJjaC1mb3J3YXJkICIjIiBtYXhwIHQpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAocHl0aG9uLXN5bnRheC1jb250ZXh0ICdjb21t ZW50KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIChwb2ludCkpKSkKKyAgICAg ICAgICAgICAgKDErIG1heHApKSkKKyAgICAgICAgIChuZXh0LWJsb2NrLW9yLWNvbW1lbnQgKG1p biBuZXh0LWJsb2NrIG5leHQtY29tbWVudCkpKQorICAgICh3aGVuICg8PSBuZXh0LWJsb2NrLW9y LWNvbW1lbnQgbWF4cCkKKyAgICAgIChnb3RvLWNoYXIgbmV4dC1ibG9jay1vci1jb21tZW50KQor ICAgICAgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgIChiZWdpbm5pbmctb2YtbGluZSkKKyAgICAg ICAgKGxvb2tpbmctYXQgcmVnZXhwKSkpKSkKIAogDAogOzs7IEltZW51CkBAIC01NDE1LDYgKzU0 NDcsMTYgQEAgcHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtZGVmdW4KICAgICAg ICAgIChiZWdpbm5pbmctb2YtbGluZSAxKQogICAgICAgICAgKGxvb2tpbmctYXQgcHl0aG9uLW5h di1iZWdpbm5pbmctb2YtZGVmdW4tcmVnZXhwKSkpKQogCisoZGVmdW4gcHl0aG9uLWluZm8tbG9v a2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2sgKCkKKyAgIkNoZWNrIGlmIHBvaW50IGlzIGF0IHRo ZSBiZWdpbm5pbmcgb2YgYmxvY2suIgorICAobGV0ICgocG9zIChwb2ludCkpKQorICAgIChzYXZl LWV4Y3Vyc2lvbgorICAgICAgKHB5dGhvbi1uYXYtYmVnaW5uaW5nLW9mLXN0YXRlbWVudCkKKyAg ICAgIChiZWdpbm5pbmctb2YtbGluZSkKKyAgICAgIChhbmQKKyAgICAgICAoPD0gKHBvaW50KSBw b3MgKCsgKHBvaW50KSAoY3VycmVudC1pbmRlbnRhdGlvbikpKQorICAgICAgIChsb29raW5nLWF0 IHB5dGhvbi1uYXYtYmVnaW5uaW5nLW9mLWJsb2NrLXJlZ2V4cCkpKSkpCisKIChkZWZ1biBweXRo b24taW5mby1jdXJyZW50LWxpbmUtY29tbWVudC1wICgpCiAgICJSZXR1cm4gbm9uLW5pbCBpZiBj dXJyZW50IGxpbmUgaXMgYSBjb21tZW50IGxpbmUuIgogICAoY2hhci1lcXVhbApAQCAtNTg3MCwx NCArNTkxMiwxNyBAQCBweXRob24tbW9kZQogCiAgIChhZGQtdG8tbGlzdAogICAgJ2hzLXNwZWNp YWwtbW9kZXMtYWxpc3QKLSAgICcocHl0aG9uLW1vZGUKLSAgICAgIlxccy0qXFxfPFxcKD86ZGVm XFx8Y2xhc3NcXClcXF8+IgorICAgYChweXRob24tbW9kZQorICAgICAscHl0aG9uLW5hdi1iZWdp bm5pbmctb2YtYmxvY2stcmVnZXhwCiAgICAgIDs7IFVzZSB0aGUgZW1wdHkgc3RyaW5nIGFzIGVu ZCByZWdleHAgc28gaXQgZG9lc24ndCBkZWZhdWx0IHRvCiAgICAgIDs7ICJcXHMpIi4gIFRoaXMg d2F5IHBhcmVucyBhdCBlbmQgb2YgZGVmdW4gYXJlIHByb3Blcmx5IGhpZGRlbi4KICAgICAgIiIK ICAgICAgIiMiCiAgICAgIHB5dGhvbi1oaWRlc2hvdy1mb3J3YXJkLXNleHAtZnVuY3Rpb24KLSAg ICAgbmlsKSkKKyAgICAgbmlsCisgICAgIHB5dGhvbi1uYXYtYmVnaW5uaW5nLW9mLWJsb2NrCisg ICAgIHB5dGhvbi1oaWRlc2hvdy1maW5kLW5leHQtYmxvY2sKKyAgICAgcHl0aG9uLWluZm8tbG9v a2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2spKQogCiAgIChzZXRxLWxvY2FsIG91dGxpbmUtcmVn ZXhwIChweXRob24tcnggKCogc3BhY2UpIGJsb2NrLXN0YXJ0KSkKICAgKHNldHEtbG9jYWwgb3V0 bGluZS1sZXZlbApkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL3Byb2dtb2Rlcy9weXRob24tdGVzdHMu ZWwgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbAppbmRleCAxMmFjODcxZmRm Li45MDZmN2VjYTdkIDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0 cy5lbAorKysgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3B5dGhvbi10ZXN0cy5lbApAQCAtNTczMCw2 ICs1NzMwLDM5IEBAIHB5dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWRlZnVuLTIK ICAgIChzaG91bGQgKG5vdCAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtZGVm dW4pKSkKICAgIChzaG91bGQgKG5vdCAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmct b2YtZGVmdW4gbmlsIHQpKSkpKQogCisoZXJ0LWRlZnRlc3QgcHl0aG9uLWluZm8tbG9va2luZy1h dC1iZWdpbm5pbmctb2YtYmxvY2stMSAoKQorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZm ZXIKKyAgICIKK2RlZiBmKCk6CisgICAgaWYgVHJ1ZToKKyAgICAgICAgcGFzcworICAgIGwgPSBb eCAqIDIKKyAgICAgICAgIGZvciB4IGluIHJhbmdlKDUpCisgICAgICAgICBpZiB4IDwgM10KKyMg aWYgRmFsc2U6CitcIlwiXCIKK2lmIDA6CitcIlwiXCIKKyIKKyAgIChweXRob24tdGVzdHMtbG9v ay1hdCAiZGVmIGYoKToiKQorICAgKHNob3VsZCAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdp bm5pbmctb2YtYmxvY2spKQorICAgKGZvcndhcmQtY2hhcikKKyAgIChzaG91bGQgKG5vdCAocHl0 aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2spKSkKKyAgIChweXRob24tdGVz dHMtbG9vay1hdCAiaWYgVHJ1ZToiKQorICAgKHNob3VsZCAocHl0aG9uLWluZm8tbG9va2luZy1h dC1iZWdpbm5pbmctb2YtYmxvY2spKQorICAgKGZvcndhcmQtY2hhcikKKyAgIChzaG91bGQgKG5v dCAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5pbmctb2YtYmxvY2spKSkKKyAgIChiZWdp bm5pbmctb2YtbGluZSkKKyAgIChzaG91bGQgKHB5dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5u aW5nLW9mLWJsb2NrKSkKKyAgIChweXRob24tdGVzdHMtbG9vay1hdCAiZm9yIHgiKQorICAgKHNo b3VsZCAobm90IChweXRob24taW5mby1sb29raW5nLWF0LWJlZ2lubmluZy1vZi1ibG9jaykpKQor ICAgKHB5dGhvbi10ZXN0cy1sb29rLWF0ICJpZiB4IDwgMyIpCisgICAoc2hvdWxkIChub3QgKHB5 dGhvbi1pbmZvLWxvb2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrKSkpCisgICAocHl0aG9uLXRl c3RzLWxvb2stYXQgImlmIEZhbHNlOiIpCisgICAoc2hvdWxkIChub3QgKHB5dGhvbi1pbmZvLWxv b2tpbmctYXQtYmVnaW5uaW5nLW9mLWJsb2NrKSkpCisgICAocHl0aG9uLXRlc3RzLWxvb2stYXQg ImlmIDA6IikKKyAgIChzaG91bGQgKG5vdCAocHl0aG9uLWluZm8tbG9va2luZy1hdC1iZWdpbm5p bmctb2YtYmxvY2spKSkpKQorCiAoZXJ0LWRlZnRlc3QgcHl0aG9uLWluZm8tY3VycmVudC1saW5l LWNvbW1lbnQtcC0xICgpCiAgIChweXRob24tdGVzdHMtd2l0aC10ZW1wLWJ1ZmZlcgogICAgIgpA QCAtNjE4Myw4ICs2MjE2LDExIEBAIHB5dGhvbi1oaWRlc2hvdy1oaWRlLWxldmVscy0xCiBjbGFz cyBTb21lQ2xhc3M6CiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgYXJnLCBrd2FyZz0xKToKKwog ICAgIGRlZiBmaWx0ZXIoc2VsZiwgbnVtcyk6Ci0gICAgZGVmIF9fc3RyX18oc2VsZik6IikpKSkK KworICAgIGRlZiBfX3N0cl9fKHNlbGYpOgorIikpKSkKICAgICAgIChvciBlbmFibGVkIChocy1t aW5vci1tb2RlIC0xKSkpKSkKIAogKGVydC1kZWZ0ZXN0IHB5dGhvbi1oaWRlc2hvdy1oaWRlLWxl dmVscy0yICgpCkBAIC02MjMwLDYgKzYyNjYsMTY1IEBAIHB5dGhvbi1oaWRlc2hvdy1oaWRlLWxl dmVscy0yCiAiKSkpKQogICAgICAgKG9yIGVuYWJsZWQgKGhzLW1pbm9yLW1vZGUgLTEpKSkpKQog CisoZXJ0LWRlZnRlc3QgcHl0aG9uLWhpZGVzaG93LWhpZGUtbGV2ZWxzLTMgKCkKKyAgIlNob3Vs ZCBoaWRlIGFsbCBibG9ja3MuIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZmZXIKKyAg ICIKK2RlZiBmKCk6CisgICAgaWYgMDoKKyAgICAgICAgbCA9IFtpIGZvciBpIGluIHJhbmdlKDUp CisgICAgICAgICAgICAgaWYgaSA8IDNdCisgICAgICAgIGFiYyA9IG8ubWF0Y2goMSwgMiwgMykK KworZGVmIGcoKToKKyAgICBwYXNzCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKGhzLWhp ZGUtbGV2ZWwgMSkKKyAgIChzaG91bGQKKyAgICAoc3RyaW5nPQorICAgICAocHl0aG9uLXRlc3Rz LXZpc2libGUtc3RyaW5nKQorICAgICAiCitkZWYgZigpOgorCitkZWYgZygpOgorIikpKSkKKwor KGVydC1kZWZ0ZXN0IHB5dGhvbi1oaWRlc2hvdy1oaWRlLWxldmVscy00ICgpCisgICJTaG91bGQg aGlkZSAybmQgbGV2ZWwgYmxvY2suIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVtcC1idWZmZXIK KyAgICIKK2RlZiBmKCk6CisgICAgaWYgMDoKKyAgICAgICAgbCA9IFtpIGZvciBpIGluIHJhbmdl KDUpCisgICAgICAgICAgICAgaWYgaSA8IDNdCisgICAgICAgIGFiYyA9IG8ubWF0Y2goMSwgMiwg MykKKworZGVmIGcoKToKKyAgICBwYXNzCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKGhz LWhpZGUtbGV2ZWwgMikKKyAgIChzaG91bGQKKyAgICAoc3RyaW5nPQorICAgICAocHl0aG9uLXRl c3RzLXZpc2libGUtc3RyaW5nKQorICAgICAiCitkZWYgZigpOgorICAgIGlmIDA6CisKK2RlZiBn KCk6CisgICAgcGFzcworIikpKSkKKworKGVydC1kZWZ0ZXN0IHB5dGhvbi1oaWRlc2hvdy1oaWRl LWFsbC0xICgpCisgICJTaG91bGQgaGlkZSBhbGwgYmxvY2tzLiIKKyAgKHB5dGhvbi10ZXN0cy13 aXRoLXRlbXAtYnVmZmVyCisgICAiaWYgMDoKKworICAgIGFhYQorICAgIGwgPSBbaSBmb3IgaSBp biByYW5nZSg1KQorICAgICAgICAgaWYgaSA8IDNdCisgICAgY2NjCisgICAgYWJjID0gby5tYXRj aCgxLCAyLCAzKQorICAgIGRkZAorCitkZWYgZigpOgorICAgIHBhc3MKKyIKKyAgIChocy1taW5v ci1tb2RlIDEpCisgICAoaHMtaGlkZS1hbGwpCisgICAoc2hvdWxkCisgICAgKHN0cmluZz0KKyAg ICAgKHB5dGhvbi10ZXN0cy12aXNpYmxlLXN0cmluZykKKyAgICAgImlmIDA6CisKK2RlZiBmKCk6 CisiKSkpKQorCisoZXJ0LWRlZnRlc3QgcHl0aG9uLWhpZGVzaG93LWhpZGUtYWxsLTIgKCkKKyAg IlNob3VsZCBoaWRlIGNvbW1lbnRzLiIKKyAgKHB5dGhvbi10ZXN0cy13aXRoLXRlbXAtYnVmZmVy CisgICAiCisjIE11bHRpIGxpbmUKKyMgY29tbWVudAorCitcIlwiXCIKKyMgTXVsdGkgbGluZQor IyBzdHJpbmcKK1wiXCJcIgorIgorICAgKGhzLW1pbm9yLW1vZGUgMSkKKyAgIChocy1oaWRlLWFs bCkKKyAgIChzaG91bGQKKyAgICAoc3RyaW5nPQorICAgICAocHl0aG9uLXRlc3RzLXZpc2libGUt c3RyaW5nKQorICAgICAiCisjIE11bHRpIGxpbmUKKworXCJcIlwiCisjIE11bHRpIGxpbmUKKyMg c3RyaW5nCitcIlwiXCIKKyIpKSkpCisKKyhlcnQtZGVmdGVzdCBweXRob24taGlkZXNob3ctaGlk ZS1hbGwtMyAoKQorICAiU2hvdWxkIG5vdCBoaWRlIGNvbW1lbnRzIHdoZW4gYGhzLWhpZGUtY29t bWVudHMtd2hlbi1oaWRpbmctYWxsJyBpcyBuaWwuIgorICAocHl0aG9uLXRlc3RzLXdpdGgtdGVt cC1idWZmZXIKKyAgICIKKyMgTXVsdGkgbGluZQorIyBjb21tZW50CisKK1wiXCJcIgorIyBNdWx0 aSBsaW5lCisjIHN0cmluZworXCJcIlwiCisiCisgICAoaHMtbWlub3ItbW9kZSAxKQorICAgKGxl dCAoKGhzLWhpZGUtY29tbWVudHMtd2hlbi1oaWRpbmctYWxsIG5pbCkpCisgICAgIChocy1oaWRl LWFsbCkpCisgICAoc2hvdWxkCisgICAgKHN0cmluZz0KKyAgICAgKHB5dGhvbi10ZXN0cy12aXNp YmxlLXN0cmluZykKKyAgICAgIgorIyBNdWx0aSBsaW5lCisjIGNvbW1lbnQKKworXCJcIlwiCisj IE11bHRpIGxpbmUKKyMgc3RyaW5nCitcIlwiXCIKKyIpKSkpCisKKyhlcnQtZGVmdGVzdCBweXRo b24taGlkZXNob3ctaGlkZS1ibG9jay0xICgpCisgICJTaG91bGQgaGlkZSBjdXJyZW50IGJsb2Nr LiIKKyAgKHB5dGhvbi10ZXN0cy13aXRoLXRlbXAtYnVmZmVyCisgICAiCitpZiAwOgorCisgICAg YWFhCisgICAgbCA9IFtpIGZvciBpIGluIHJhbmdlKDUpCisgICAgICAgICBpZiBpIDwgM10KKyAg ICBjY2MKKyAgICBhYmMgPSBvLm1hdGNoKDEsIDIsIDMpCisgICAgZGRkCisKK2RlZiBmKCk6Cisg ICAgcGFzcworIgorICAgKGhzLW1pbm9yLW1vZGUgMSkKKyAgIChweXRob24tdGVzdHMtbG9vay1h dCAiZGRkIikKKyAgIChmb3J3YXJkLWxpbmUpCisgICAoaHMtaGlkZS1ibG9jaykKKyAgIChzaG91 bGQKKyAgICAoc3RyaW5nPQorICAgICAocHl0aG9uLXRlc3RzLXZpc2libGUtc3RyaW5nKQorICAg ICAiCitpZiAwOgorCitkZWYgZigpOgorICAgIHBhc3MKKyIpKSkpCisKIAogKGVydC1kZWZ0ZXN0 IHB5dGhvbi10ZXN0cy0tcHl0aG9uLW5hdi1lbmQtb2Ytc3RhdGVtZW50LS1pbmZsb29wICgpCiAg ICJDaGVja3MgdGhhdCBgcHl0aG9uLW5hdi1lbmQtb2Ytc3RhdGVtZW50JyBkb2Vzbid0IGluZmxv b3AgaW4gYQo= --000000000000275b4805e6fd51a5-- From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 25 08:31:40 2022 Received: (at 56635) by debbugs.gnu.org; 25 Aug 2022 12:31:40 +0000 Received: from localhost ([127.0.0.1]:49268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRC1M-0004HE-GV for submit@debbugs.gnu.org; Thu, 25 Aug 2022 08:31:40 -0400 Received: from quimby.gnus.org ([95.216.78.240]:59856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRC1I-0004Gx-JY for 56635@debbugs.gnu.org; Thu, 25 Aug 2022 08:31:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6fVuZ2aqsgXc9xl9XgKsgXeR3uMca+xkJ3KOWP6U/b0=; b=pgLNdOrxCb1V5aj01WTDRdZkY8 eS4OxwOXDiMBN0OutYJYwAHk6qx0WBS1V+pKKtFPUM1HTt4OtrgjvF7oLNSmNXnZK0reyGlQT90pN CHNVCwJ7DfWONjZpN+izcADcC27NjEJBcSyhH39xaYwVw5JkGrnbjxEWZfjGh1lwR5Kc=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oRC19-0007eu-EW; Thu, 25 Aug 2022 14:31:29 +0200 From: Lars Ingebrigtsen To: kobarity Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks In-Reply-To: (kobarity@gmail.com's message of "Wed, 24 Aug 2022 23:15:31 +0900") References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87tu6bjghr.fsf@gnus.org> <871qtfjfa9.fsf@gnus.org> <87bksa8o0o.fsf@secretsauce.net> <877d2yos1z.fsf@gnus.org> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAElBMVEVnUFUvICeQdnHI sqnu2c3////L8581AAAAAWJLR0QF+G/pxwAAAAd0SU1FB+YIGQwdN19jMZwAAAGJSURBVDjLfZKL bcMwDEQppgOQnkChPUAgaYCg8v4z9SjabtKqJZAP9HT8nEhEQsTGbLXW9kkROeNrxUFvdffoBbiu hZjotk+iAGwz0JGpzcCeSebgcYJeW40IYLTsLwA9tStVnxbPtEwBBp0XB0jNC7xFzJEweeekKiLw zD3a/IS8rZo1QthsmOSTywUEOgL5CHAqht1JxWyLGuCVcJ3SQKrWRg3dvLlDEI+2taFw7iBzJgOg sl22u4Izk7louW9uLtEewBgawhjyAjxVRqeCFuh2bwE8FboEIJ+D6wMnzwvEIA5KflPgSJKnksQB 0gkw4ZKg0QOMriIVWnNvcov38Mnv+h1yAnhVXsGSoyvFTynjaoAbHe16jVrSpbDRp/g77SXz9Yha wr0DEK85RPI4Ujn4ZPi6WoraNF6I1E3EHd+bYmZrsXaB6cLpdBP7X4r9H4VbMkq349NPsP0A9d/i TxkPNQFnqgmYpoLZlNa1ZIVZ5lbUbIyd8P3SX+GbrYnG5vh/lBOhM9IXU2e7LX3c0uYAAAAldEVY dGRhdGU6Y3JlYXRlADIwMjItMDgtMjVUMTI6Mjk6NTUrMDA6MDDG+hjTAAAAJXRFWHRkYXRlOm1v ZGlmeQAyMDIyLTA4LTI1VDEyOjI5OjU1KzAwOjAwt6egbwAAAABJRU5ErkJggg== X-Now-Playing: Two Nice Girls's _Chloe Liked Olivia_: "Let's Go Bonding" Date: Thu, 25 Aug 2022 14:31:26 +0200 Message-ID: <871qt4ld29.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: kobarity writes: > Lars, attached are the revised and rebased patches. They should be > applied in the order: > > - 1-hideshow.patch > - 2-python.patch > > No other patches are required. Thank you for your cooperation [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 56635 Cc: Augusto Stoffel , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) kobarity writes: > Lars, attached are the revised and rebased patches. They should be > applied in the order: > > - 1-hideshow.patch > - 2-python.patch > > No other patches are required. Thank you for your cooperation. Thanks; pushed to Emacs 29. I had to apply the patches "by hand" instead of with "git am" because "git am" complained: --- Nonempty second line in commit message Commit aborted; please see the file CONTRIBUTE --- I'm not quite sure what that refers to -- the second line looked pretty empty to me (except some spaces). But even removing those spaces didn't help. From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 25 08:31:50 2022 Received: (at control) by debbugs.gnu.org; 25 Aug 2022 12:31:50 +0000 Received: from localhost ([127.0.0.1]:49271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRC1V-0004Hb-Pn for submit@debbugs.gnu.org; Thu, 25 Aug 2022 08:31:49 -0400 Received: from quimby.gnus.org ([95.216.78.240]:59872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRC1S-0004HM-9g for control@debbugs.gnu.org; Thu, 25 Aug 2022 08:31:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7t/16OTYk81DSk1m++/MSbHpWqCaa2BsXft0wlyAsX8=; b=nAnu4+AC1vV8ud8/kN9PvO0r3p htPMvGU8wmcqGDPGBTCtoFgFPmlVycVM5CG1y3O90XcfcJaBcQ6ywQD185KDdoWna7q0i1iCN46EF Nv9oVcJBoR6f/hrH2MQ5m8Xx0yRGGX89eFTmvJ6Kjbyz1ExH9cwcajUIIMT+WNuLpC3Y=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oRC1J-0007f9-Cq for control@debbugs.gnu.org; Thu, 25 Aug 2022 14:31:40 +0200 Date: Thu, 25 Aug 2022 14:31:37 +0200 Message-Id: <87zgfsjyhi.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #56635 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 56635 29.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) close 56635 29.1 quit From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 25 09:40:10 2022 Received: (at 56635) by debbugs.gnu.org; 25 Aug 2022 13:40:10 +0000 Received: from localhost ([127.0.0.1]:49491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRD5P-0004Ct-IQ for submit@debbugs.gnu.org; Thu, 25 Aug 2022 09:40:10 -0400 Received: from mail-ej1-f49.google.com ([209.85.218.49]:43992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRD5N-0004Cf-Ua for 56635@debbugs.gnu.org; Thu, 25 Aug 2022 09:39:54 -0400 Received: by mail-ej1-f49.google.com with SMTP id gb36so39569479ejc.10 for <56635@debbugs.gnu.org>; Thu, 25 Aug 2022 06:39:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=lo8awbGQrY4vkHYrN/RrdEqcfCugUL0nnbUBZItK7OE=; b=iwlUyAz12OXFO6WeSEAgzHAbbmsckaM5pTqMnYaFujoZAKp0cuTmQ0Dtlf98LoSjyw kinQ8wQrHC+u3Txe1YCWD/g+0ebthfQ0OY3CjZk0259eZDs/I2gGFeTx3ThAXp2jvAnZ xkjD3yGuo6oysJSgwhkqWwYBFus+8a84k7ytSfFTauyUTWQrEkq2MdzWJ2VuIgAFEFWc rFCpxqYTcnhypp9lEu3yrTMvH19Rx3zFeB8uPglbjWAmdmC8IuuX0xL7BbVa4FXs4XiT R8Jfoy+dEuId+Bbe00yPNxH+RtvQxZl9ugjNdcXi2rvk9KPUiAlZVdhKN9eGodJ2h2OT UZAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=lo8awbGQrY4vkHYrN/RrdEqcfCugUL0nnbUBZItK7OE=; b=4PmP5IhCwOe0gjtoX1lq7jx35xFWqTjk3sQJDbC6ACwPzJx9VHSFw8068TBlWaQSt7 rlRNgSeN1wBhUAPeHITyfUJ9W4+rF+F3k1H5AnRpFlQoLZbDIrhZlCvP80WCWYYNRxdJ yNYrT1fulQQ14jxUBLkAhzTTYnn1IM9xfGUqD/IeANX8Ikb0DrktBiG082yXsaGp6/LA TI0kyHHAzjedRc1BnXcG932ud1U3Euw/ynTNWUI6I72P6STPCc37K1Cw9mABsZXa627p mAHkic1O9S5yC7nOB8DCas8CKD3ZpeGLZDOXfsggXkWpVaxpjo/ArcWV5x5OQjEaSd9n FQKA== X-Gm-Message-State: ACgBeo1Z2HvoHpLag7+j8LvIq5KUgHJXxCyOmZatD1R7FXspE4c/Qqj7 UvWc5LxIdBe/JMdEV9gfj/Bco7VAcNxuJVH8yyA= X-Google-Smtp-Source: AA6agR6jRYr6Ro1QwQBLkGG6vWENR1/oqklGxEONNtrITCXewZ9m7oWPNfLyfDVj54Tm1YJmxxmTt64kn9EbqZgXDh4= X-Received: by 2002:a17:907:1611:b0:73d:6d23:5787 with SMTP id hb17-20020a170907161100b0073d6d235787mr2547204ejc.231.1661434788093; Thu, 25 Aug 2022 06:39:48 -0700 (PDT) MIME-Version: 1.0 References: <87v8ruysep.fsf@secretsauce.net> <87zgh01cqm.fsf@gnus.org> <87sfmr5zi9.fsf@secretsauce.net> <87wnbt3vnq.fsf@secretsauce.net> <878rnyg40d.fsf@gmail.com> <87tu6bjghr.fsf@gnus.org> <871qtfjfa9.fsf@gnus.org> <87bksa8o0o.fsf@secretsauce.net> <877d2yos1z.fsf@gnus.org> <871qt4ld29.fsf@gnus.org> In-Reply-To: <871qt4ld29.fsf@gnus.org> From: kobarity Date: Thu, 25 Aug 2022 22:39:33 +0900 Message-ID: Subject: Re: bug#56635: 29.0.50; [PATCH] hide-show in python-mode supports ONLY function and class blocks To: Lars Ingebrigtsen Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 56635 Cc: Augusto Stoffel , Dima Kogan , 56635@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Lars Ingebrigtsen wrote: > Thanks; pushed to Emacs 29. I had to apply the patches "by hand" > instead of with "git am" because "git am" complained: Thank you for applying the patches, and sorry for the inconvenience. I'm going to review my email environment. Regards, From unknown Fri Jun 20 05:32:26 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 23 Sep 2022 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator