From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#62158: treesit-end-of-defun error Date: Mon, 20 Mar 2023 20:21:38 +0200 Organization: LINKOV.NET Message-ID: <868rfrthal.fsf@mail.linkov.net> References: <868rg13y9w.fsf_-_@mail.linkov.net> <48E5D6CC-3249-4A5E-82B6-D3B9BF37D40A@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33677"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (x86_64-pc-linux-gnu) Cc: 62158@debbugs.gnu.org, Dmitry Gutov To: Yuan Fu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 20 19:23:23 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1peKAE-0008bT-Rj for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 20 Mar 2023 19:23:22 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peK9x-0006aj-5j; Mon, 20 Mar 2023 14:23:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peK9v-0006aD-1K for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2023 14:23:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peK9u-0004bB-HQ for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2023 14:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peK9u-0007YH-95 for bug-gnu-emacs@gnu.org; Mon, 20 Mar 2023 14:23:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Mar 2023 18:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62158 X-GNU-PR-Package: emacs Original-Received: via spool by 62158-submit@debbugs.gnu.org id=B62158.167933655228972 (code B ref 62158); Mon, 20 Mar 2023 18:23:02 +0000 Original-Received: (at 62158) by debbugs.gnu.org; 20 Mar 2023 18:22:32 +0000 Original-Received: from localhost ([127.0.0.1]:56771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peK9P-0007XD-LC for submit@debbugs.gnu.org; Mon, 20 Mar 2023 14:22:31 -0400 Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]:59373) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peK9N-0007Wx-Rc; Mon, 20 Mar 2023 14:22:30 -0400 Original-Received: (Authenticated sender: juri@linkov.net) by mail.gandi.net (Postfix) with ESMTPSA id 26422E0008; Mon, 20 Mar 2023 18:22:20 +0000 (UTC) In-Reply-To: <48E5D6CC-3249-4A5E-82B6-D3B9BF37D40A@gmail.com> (Yuan Fu's message of "Mon, 13 Mar 2023 15:04:37 -0700") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:258308 Archived-At: close 62158 29.0.60 thanks >>> The fix seems to be easy: >>> >>> diff --git a/lisp/treesit.el b/lisp/treesit.el >>> index c118f5d52a4..b271a1f0c4b 100644 >>> --- a/lisp/treesit.el >>> +++ b/lisp/treesit.el >>> @@ -1882,6 +1882,7 @@ treesit-end-of-defun >>> `treesit-defun-skipper'." >>> (interactive "^p\nd") >>> (let ((orig-point (point))) >>> + (if (or (null arg) (= arg 0)) (setq arg 1)) >>> (catch 'done >>> (dotimes (_ 2) ; Not making progress is better than infloop. >>> >>> But I'm not quite sure if that is what we want to do. > > This looks good to me. So Dmitry's fix is pushed to emacs-29.