From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#19342: auto-fill scan-error in sh-mode Date: Thu, 05 May 2022 15:39:26 +0200 Message-ID: <874k24p08h.fsf@gnus.org> References: <87tujl7ec9.fsf@gnus.org> <8735qsgki5.fsf@gnus.org> <87sfyrahh0.fsf@gnus.org> <878s0i76ek.fsf@gnus.org> <87eeaaj9rq.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3023"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Glenn Morris , 19342@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu May 05 15:42:08 2022 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 1nmbk8-0000bB-6y for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 May 2022 15:42:08 +0200 Original-Received: from localhost ([::1]:50146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmbk7-0007tT-54 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 05 May 2022 09:42:07 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmbi6-0003mc-On for bug-gnu-emacs@gnu.org; Thu, 05 May 2022 09:40:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50943) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nmbi6-0005UD-Dr for bug-gnu-emacs@gnu.org; Thu, 05 May 2022 09:40:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nmbi6-0002jo-4s for bug-gnu-emacs@gnu.org; Thu, 05 May 2022 09:40:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 May 2022 13:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19342 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 19342-submit@debbugs.gnu.org id=B19342.165175798010484 (code B ref 19342); Thu, 05 May 2022 13:40:02 +0000 Original-Received: (at 19342) by debbugs.gnu.org; 5 May 2022 13:39:40 +0000 Original-Received: from localhost ([127.0.0.1]:44840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nmbhk-0002j1-C7 for submit@debbugs.gnu.org; Thu, 05 May 2022 09:39:40 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:53864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nmbhj-0002iq-Dy for 19342@debbugs.gnu.org; Thu, 05 May 2022 09:39:39 -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:In-Reply-To:Date: References: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=SvBhKNqjcp3M+GzYKtW89oIuI8RsnYljhokwV0+fdY8=; b=o/4+YVMJ6fdMpe9Cmgz+Hrw5n3 0ugNdj3Q3tEoBGniFsP32gHkkPaxgYgabgX5wlfZsIP5hoXZ8f3GnFnTXRvt3E/vJ101FZmZd+Wl0 smwesD+2WNqXsq65Ux/7kg9TKzP8TuGpPIYPauiox8am24BcDk7C0bMIkWdIhcgD4Nq0=; Original-Received: from [84.212.220.105] (helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nmbhY-0002TH-DF; Thu, 05 May 2022 15:39:31 +0200 X-Now-Playing: Rachel Unthank & The Winterset's _Cruel Sister_: "Twenty Long Weeks" In-Reply-To: <87eeaaj9rq.fsf@gnus.org> (Lars Ingebrigtsen's message of "Tue, 31 Aug 2021 10:31:05 +0200") 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:231434 Archived-At: I took a stab at fixing this with the following patch. All tests pass after applying it, but I'm unsure how much test coverage there is in this area... Any comments? diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 2bab131913..3b9f983cdb 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1850,20 +1850,26 @@ smie-auto-fill (save-excursion (let ((end (point)) (bsf nil) ;Best-so-far. - (gain 0)) + (gain 0) + newcol) (beginning-of-line) (while (progn (smie-indent-forward-token) - (and (<= (point) end) - (<= (current-column) fc))) - ;; FIXME? `smie-indent-calculate' can (and often - ;; does) return a result that actually depends on the - ;; presence/absence of a newline, so the gain computed - ;; here may not be accurate, but in practice it seems - ;; to work well enough. - (skip-chars-forward " \t") - (let* ((newcol (smie-indent-calculate)) - (newgain (- (current-column) newcol))) + (and + (<= (point) end) + (<= (current-column) fc) + ;; FIXME? `smie-indent-calculate' can + ;; (and often does) return a result that + ;; actually depends on the presence/absence + ;; of a newline, so the gain computed here + ;; may not be accurate, but in practice it + ;; seems to work well enough. + (progn + (skip-chars-forward " \t") + (setq newcol + (ignore-error 'scan-error + (smie-indent-calculate)))))) + (let ((newgain (- (current-column) newcol))) (when (> newgain gain) (setq gain newgain) (setq bsf (point))))) -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no