GNU bug report logs - #9622
23.3; flet indentation

Previous Next

Full log

Message #118 received at 9622 <at> debbugs.gnu.org (full text, mbox):

From: akater <nuclearspace <at> gmail.com>
To: Lars Ingebrigtsen <larsi <at> gnus.org>
Cc: 9622 <at> debbugs.gnu.org
Subject: Re: bug#9622: [PATCH] Re: bug#9622: 23.3; flet indentation
Date: Mon, 08 Nov 2021 09:36:39 +0000

[Message part 1 (text/plain, inline)]

Lars Ingebrigtsen <larsi <at> gnus.org> writes:

> akater <nuclearspace <at> gmail.com> writes:
>
>> Sorry: even though half of the tests pass, I did not preserve one check
>> with the last patch and it better be preserved just to be safe:
>
> Can you send a new patch against the current trunk?

Here it goes.

[0001-lisp-emacs-lisp-lisp-mode.el-Restore-one-check.patch (text/x-diff, inline)]

From 2a988ef49e1ea954a99e4c123301165764feebac Mon Sep 17 00:00:00 2001
From: akater <nuclearspace <at> gmail.com>
Date: Mon, 8 Nov 2021 04:48:13 +0000
Subject: [PATCH] ; * lisp/emacs-lisp/lisp-mode.el: Restore one check.

* lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p):
Do check backward-up-list executing without errors
---
 lisp/emacs-lisp/lisp-mode.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index a5613e70e0a..d90d0f5f6ac 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1149,12 +1149,12 @@ defun lisp--local-defform-body-p (state)
                               t)
                              (point))))))
                (save-excursion
-                 (ignore-errors
-                   ;; We rely on `backward-up-list' working
-                   ;; even when sexp is incomplete “to the right”.
-                   (backward-up-list 2)
-                   t)
-                 (= local-definitions-starting-point (point)))))))))
+                 (when (ignore-errors
+                         ;; We rely on `backward-up-list' working
+                         ;; even when sexp is incomplete “to the right”.
+                         (backward-up-list 2)
+                         t)
+                   (= local-definitions-starting-point (point))))))))))
 
 (defun lisp-indent-function (indent-point state)
   "This function is the normal value of the variable `lisp-indent-function'.
-- 
2.32.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.