From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Anticrisis Newsgroups: gmane.emacs.bugs Subject: bug#44834: Fix for failing indentation of Tcl procs nested in namespace Date: Thu, 21 Jan 2021 15:17:41 -1000 Message-ID: References: <87sg8zk4lj.fsf@precedence.co.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000021749b05b972f5b3" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37773"; mail-complaints-to="usenet@ciao.gmane.io" To: 44834@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 22 02:18:11 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l2l5W-0009iv-D8 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Jan 2021 02:18:10 +0100 Original-Received: from localhost ([::1]:47812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2l5V-0007Jn-Dj for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Jan 2021 20:18:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2l5O-0007Je-JV for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 20:18:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2l5O-0005cc-CW for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 20:18:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2l5O-00081U-6M for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 20:18:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <87sg8zk4lj.fsf@precedence.co.uk> Resent-From: Anticrisis Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Jan 2021 01:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44834 X-GNU-PR-Package: emacs Original-Received: via spool by 44834-submit@debbugs.gnu.org id=B44834.161127828130838 (code B ref 44834); Fri, 22 Jan 2021 01:18:02 +0000 Original-Received: (at 44834) by debbugs.gnu.org; 22 Jan 2021 01:18:01 +0000 Original-Received: from localhost ([127.0.0.1]:59777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2l5N-00081G-Di for submit@debbugs.gnu.org; Thu, 21 Jan 2021 20:18:01 -0500 Original-Received: from mail-ed1-f47.google.com ([209.85.208.47]:36375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2l5L-000813-Mw for 44834@debbugs.gnu.org; Thu, 21 Jan 2021 20:18:00 -0500 Original-Received: by mail-ed1-f47.google.com with SMTP id d2so1170509edz.3 for <44834@debbugs.gnu.org>; Thu, 21 Jan 2021 17:17:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=AYbqF0jKTzGEQn7esImSfyhOx+nz8hNEm7tbRlzIZ7A=; b=g+pkNAAYFrABQ6eiP2AwmKRTR2UrMZjBYtPG32v0dwhgGlsgniJcEQHndBNlbKCWxI Bq/NJY4pakuFi2uPS1F7P//yfGGZZkHVzBFSV7XwB4hSbG7o0U+tqtpm6siCNYkP+WD/ u962H2WTJZ19Oez2dqYSe0tHpwYn+MukP3btiG7IwmEXXs4KOJoZRHWQRgl9Iu57pvnh 5fBwOdBPN+FSWubaZRxI/T1ChD1lgG8IIdOF1aZ+ZqCenlFb/HnfGL2W7h4Wvr/lV62o PabmJ6ilUK90vwTDBoq/Mswkd7w3jCHQWA/0996c9ru7QUzGoesWO6ySkWvvtxzBeaig k1xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=AYbqF0jKTzGEQn7esImSfyhOx+nz8hNEm7tbRlzIZ7A=; b=Nu/N+6rT1JygcJayqaja76e+d3m3v4inlfjKGSAk2tylclhLib2NEODPuEjMYM+bl3 yOpA+4g2GV2m9rrRHFJ9Jmm1oaZgDir4sivz29pQEay+NIXmQMhx/uLGBIubRrLVZX2y F2yXOtSuKAOVhNn2BxgTQuXUUVsZmnoUrsETv7Pto95bVJdt9e8Sl2pQprRynnJXovf5 q3NTq1SAKs8srLo3/hj0bwG9oM/cFRGW0gOOJEBoPWRr67myZCTJHzAFSrOMjRsQ7l+K 5rR1vxU4IYDh8hWCfg4udr8CUVSYKGvBDH/8qxgKuaXLOOf+q2VHhWRPLYSeLFsnB8sN 5+Bg== X-Gm-Message-State: AOAM530rGQnqqKGkzoPXdnWPsmLR9l9cn7QzPNL4Bgf/u95yXvZti6jE v+najxbYnTZtzgt+HQjcPOes1DkJXry3ELSmqbwFGtefusbl8Q== X-Google-Smtp-Source: ABdhPJzeJ6JVLBL57Y5vpo7y5kmH/kTORac+n3qjic1BJgxZTM6/fNDnAjLgVXXObjh5CeR3cPajYaw2nliLxzeLcE8= X-Received: by 2002:a05:6402:1701:: with SMTP id y1mr1351241edu.251.1611278273564; Thu, 21 Jan 2021 17:17:53 -0800 (PST) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:198356 Archived-At: --00000000000021749b05b972f5b3 Content-Type: text/plain; charset="UTF-8" This patch corrects the problem by partially backing out changes introduced in this commit 2 1/2 years ago: https://git.savannah.gnu.org/cgit/emacs.git/commit/lisp/progmodes/tcl.el?id=cd5bb4bf3dbad8941d25823f398b595b8f0edbb9 The patch removes the customized tcl-beginning-of-defun-function in favor of relying on the existing lisp mechanism. It preserves the customized tcl-end-of-defun-function because that is required for some test cases. The expected-failing test was marked as succeeding. This is a minor change. I did not refer to any code outside of emacs itself in investigating and correcting this bug. I will not be able to provide additional paperwork. --00000000000021749b05b972f5b3 Content-Type: text/plain; charset="US-ASCII"; name="tcl-beginning-of-defun-patch.txt" Content-Disposition: attachment; filename="tcl-beginning-of-defun-patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kk7l9lu60 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3RjbC5lbCBiL2xpc3AvcHJvZ21vZGVzL3RjbC5l bAppbmRleCAwYTAxMThhNWViLi5jMjk0YTJhZjIyIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rl cy90Y2wuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvdGNsLmVsCkBAIC02NTEsNyArNjUxLDYgQEAg dGNsLW1vZGUKICAgKHNldHEtbG9jYWwgYWRkLWxvZy1jdXJyZW50LWRlZnVuLWZ1bmN0aW9uCiAg ICAgICAgIyd0Y2wtYWRkLWxvZy1kZWZ1bikKIAotICAoc2V0cS1sb2NhbCBiZWdpbm5pbmctb2Yt ZGVmdW4tZnVuY3Rpb24gIyd0Y2wtYmVnaW5uaW5nLW9mLWRlZnVuLWZ1bmN0aW9uKQogICAgKHNl dHEtbG9jYWwgZW5kLW9mLWRlZnVuLWZ1bmN0aW9uICMndGNsLWVuZC1vZi1kZWZ1bi1mdW5jdGlv bikpCiAKIAwKQEAgLTg0OSwxNCArODQ4LDEyIEBAIHRjbC1jYWxjdWxhdGUtaW5kZW50CiAgICAg ICAgICAgIHN0YXRlCiAgICAgICAgICAgIGNvbnRhaW5pbmctc2V4cAogICAgICAgICAgICBmb3Vu ZC1uZXh0LWxpbmUpCi0gICAgICAoY29uZAotICAgICAgIChwYXJzZS1zdGFydAorCisgICAgICAo aWYgcGFyc2Utc3RhcnQKICAgICAgICAgICAoZ290by1jaGFyIHBhcnNlLXN0YXJ0KSkKLSAgICAg ICAoKG5vdCAoYmVnaW5uaW5nLW9mLWRlZnVuKSkKLSAgICAgICAgOzsgSWYgd2UncmUgbm90IGlu IGEgZnVuY3Rpb24sIGRvbid0IHVzZQotICAgICAgICA7OyBgdGNsLWJlZ2lubmluZy1vZi1kZWZ1 bi1mdW5jdGlvbicuCi0gICAgICAgIChsZXQgKChiZWdpbm5pbmctb2YtZGVmdW4tZnVuY3Rpb24g bmlsKSkKLSAgICAgICAgICAoYmVnaW5uaW5nLW9mLWRlZnVuKSkpKQorCisgICAgICAoYmVnaW5u aW5nLW9mLWRlZnVuKQorCiAgICAgICAod2hpbGUgKDwgKHBvaW50KSBpbmRlbnQtcG9pbnQpCiAg ICAgICAgIChzZXRxIHBhcnNlLXN0YXJ0IChwb2ludCkpCiAgICAgICAgIChzZXRxIHN0YXRlIChw YXJzZS1wYXJ0aWFsLXNleHAgKHBvaW50KSBpbmRlbnQtcG9pbnQgMCkpCkBAIC0xMDM1LDIyICsx MDMyLDYgQEAgdGNsLWluZGVudC1leHAKIDs7IEludGVyZmFjZXMgdG8gb3RoZXIgcGFja2FnZXMu CiA7OwogCi0oZGVmdW4gdGNsLWJlZ2lubmluZy1vZi1kZWZ1bi1mdW5jdGlvbiAoJm9wdGlvbmFs IGFyZykKLSAgImBiZWdpbm5pbmctb2YtZGVmdW4tZnVuY3Rpb24nIGZvciBUY2wgbW9kZS4iCi0g ICh3aGVuIChvciAobm90IGFyZykgKD0gYXJnIDApKQotICAgIChzZXRxIGFyZyAxKSkKLSAgKGxl dCogKChzZWFyY2gtZm4gKGlmICg+IGFyZyAwKQotICAgICAgICAgICAgICAgICAgICAgICAgOzsg UG9zaXRpdmUgYXJnIG1lYW5zIHRvIHNlYXJjaCBiYWNrd2FyZC4KLSAgICAgICAgICAgICAgICAg ICAgICAgICMncmUtc2VhcmNoLWJhY2t3YXJkCi0gICAgICAgICAgICAgICAgICAgICAgIydyZS1z ZWFyY2gtZm9yd2FyZCkpCi0gICAgICAgICAoYXJnIChhYnMgYXJnKSkKLSAgICAgICAgIChyZXN1 bHQgdCkpCi0gICAgKHdoaWxlIChhbmQgKD4gYXJnIDApIHJlc3VsdCkKLSAgICAgICh1bmxlc3Mg KGZ1bmNhbGwgc2VhcmNoLWZuIHRjbC1wcm9jLXJlZ2V4cCBuaWwgdCkKLSAgICAgICAgKHNldHEg cmVzdWx0IG5pbCkpCi0gICAgICAoc2V0cSBhcmcgKDEtIGFyZykpKQotICAgIHJlc3VsdCkpCi0K IChkZWZ1biB0Y2wtZW5kLW9mLWRlZnVuLWZ1bmN0aW9uICgpCiAgICJgZW5kLW9mLWRlZnVuLWZ1 bmN0aW9uJyBmb3IgVGNsIG1vZGUuIgogICA7OyBCZWNhdXNlIHdlIGxldCB1c2VycyByZWRlZmlu ZSB0Y2wtcHJvYy1saXN0LCB3ZSBkb24ndCByZWFsbHkga25vdwpkaWZmIC0tZ2l0IGEvdGVzdC9s aXNwL3Byb2dtb2Rlcy90Y2wtdGVzdHMuZWwgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3RjbC10ZXN0 cy5lbAppbmRleCBjZjFlZDI4OTZlLi5lNTVlYjZkOTAxIDEwMDY0NAotLS0gYS90ZXN0L2xpc3Av cHJvZ21vZGVzL3RjbC10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3RjbC10ZXN0 cy5lbApAQCAtNzQsNyArNzQsNiBAQCB0Y2wtbW9kZS1uYW1lc3BhY2UtaW5kZW50CiAKIDs7IEZy b20gYnVnIzQ0ODM0CiAoZXJ0LWRlZnRlc3QgdGNsLW1vZGUtbmFtZXNwYWNlLWluZGVudC0yICgp Ci0gIDpleHBlY3RlZC1yZXN1bHQgOmZhaWxlZAogICAod2l0aC10ZW1wLWJ1ZmZlcgogICAgICh0 Y2wtbW9kZSkKICAgICAobGV0ICgodGV4dCAibmFtZXNwYWNlIGV2YWwgRm9vIHtcbiAgICBwcm9j IGZvbyB7fSB7fVxuXG4gICAgcHJvYyBiYXIge317fX1cbiIpKQo= --00000000000021749b05b972f5b3--