From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: akater Newsgroups: gmane.emacs.bugs Subject: bug#9622: [PATCH] Re: bug#9622: 23.3; flet indentation Date: Mon, 08 Nov 2021 06:18:11 +0000 Message-ID: <875yt39nmk.fsf@gmail.com> References: <504153FB-8633-4755-A91A-DF5DD64E6FAA@acm.org> <87lf3fntdx.fsf@gmail.com> <878rxz8n6b.fsf_-_@web.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23123"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= , Lars Ingebrigtsen , "Diogo F. S. Ramos" To: Michael Heerdegen , 9622@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 08 07:30:13 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 1mjyAX-0005u4-FB for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 08 Nov 2021 07:30:13 +0100 Original-Received: from localhost ([::1]:33062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjyAW-0008Av-Fr for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 08 Nov 2021 01:30:12 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:45650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjyAN-0008Ad-A5 for bug-gnu-emacs@gnu.org; Mon, 08 Nov 2021 01:30:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44280) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mjyAM-00075F-V2 for bug-gnu-emacs@gnu.org; Mon, 08 Nov 2021 01:30:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mjyAM-0007ur-P8 for bug-gnu-emacs@gnu.org; Mon, 08 Nov 2021 01:30:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: akater Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 08 Nov 2021 06:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9622 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 9622-submit@debbugs.gnu.org id=B9622.163635300130387 (code B ref 9622); Mon, 08 Nov 2021 06:30:02 +0000 Original-Received: (at 9622) by debbugs.gnu.org; 8 Nov 2021 06:30:01 +0000 Original-Received: from localhost ([127.0.0.1]:55826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjyAK-0007u3-Qq for submit@debbugs.gnu.org; Mon, 08 Nov 2021 01:30:01 -0500 Original-Received: from mail-ed1-f51.google.com ([209.85.208.51]:33692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjyAI-0007tj-5o for 9622@debbugs.gnu.org; Mon, 08 Nov 2021 01:29:59 -0500 Original-Received: by mail-ed1-f51.google.com with SMTP id m14so57430049edd.0 for <9622@debbugs.gnu.org>; Sun, 07 Nov 2021 22:29:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=/RUq5Fr8iIYOm+CBgoR7UFXGsneGr0DlkLGTMvDSm4I=; b=kCe5n0J66d45/Z4HNCzchIiig0iztx4uV4U3pZgjHwQzTplg0qsJiSbwsqTQ2nRgjC TkhcokWBuDEva5tIQ5GDZCgOznHucHpW4IcGezVWPXwQGRL63mD3DC7ozAT619AqUQHO HlTenaRNPj/Q/ZbKWkD/67WFkJkGZJZHDqEcV1PowCNu68VUDBMFkSqlLzeJvHneM7O7 nONdayryQg5AhAEmtMF6iLBfzpUnVy8IUkYuGETD5nkp5K+tvFzqTq/sQ7ou+aTYvVHe ovAOXpp2z6oGBG2ImGT/SjRLYqhchsd125qo/ycaMGPp+0MU3k3z9bXfCjSA5bspNsS+ AdVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=/RUq5Fr8iIYOm+CBgoR7UFXGsneGr0DlkLGTMvDSm4I=; b=GMEUTo/2YrYPYFWr9DzLQecCpR3NxUuTywXEZcPblyD38jP+qDsAoqD/EZjr5QslJ9 AYHYulQ7Rs5DIFK8szZTvuZGiRNDMaW/btG3NFAAhPF13j1ym/uNB73kRSO+A1T7/Ogf HsSSYgpW6xTGDOqY1ZpdCaCn6STN9Eg51pxt9sl89lQSm5kCeurXQB043EpmM+zLU/Yx pUipLJQ32gQyDZ1VSSAQ0EWtfjPvYOzU7dk6zeHJRAkFtkWYwsTYEVUypg+Pwqe80wct pw1MSwzO+OdAtoiz9a7Hxn6OhwNQQMf8qEAAUi0e2Psnc105wIUX2AxNOIypiXBVVRNP aN/Q== X-Gm-Message-State: AOAM533nQco+8uu6rOmqw3VTf9cKSc3O2dLhLBFKkabc5dhC5GSzpwsx qOXMyW8SgrCHsvYrF+NpVoA= X-Google-Smtp-Source: ABdhPJwoEge1zyXpmOYEHFrjIMPe+OFeobfw0biId1U2vrigPBC7dd21KIWxlPRJTBhEkThmTSe3HQ== X-Received: by 2002:a17:906:368e:: with SMTP id a14mr91991042ejc.60.1636352992156; Sun, 07 Nov 2021 22:29:52 -0800 (PST) Original-Received: from localhost ([31.210.20.110]) by smtp.googlemail.com with ESMTPSA id he14sm5399101ejc.55.2021.11.07.22.29.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Nov 2021 22:29:51 -0800 (PST) In-Reply-To: <878rxz8n6b.fsf_-_@web.de> 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:219326 Archived-At: --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Michael Heerdegen writes: > #+begin_src emacs-lisp > (cl-flet* ((cont-w/expr (f) (g-w/extended-expr cont f)) > (cont-prepend (&rest exps) > (cont-w/expr (lambda (p) (apply #'g--and (append exps (list p))))))) > (pcase expr > ((and (let transformed (g--trivial-transformation-p expr)) (guard transformed)) > (cont-prepend transformed)))) > #+end_src > > and the last line gets indented wrongly (one space too less). When I > remove the wrapping `cl-flet*' indentation behavior gets back to the > expected. Indeed, I forgot one save-excursion. To Lars: tests involving complete sexps do pass, the rest I couldn't run, as described in bug#51680 --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJLBAEBCgA1FiEEgu5SJRdnQOF34djNsr6xYbHsf0QFAmGIwSYXHG51Y2xlYXJz cGFjZUBnbWFpbC5jb20ACgkQsr6xYbHsf0TalA//RdHrQUhO+N/jfzFfnULj92Nl CJJljoixKDuzNJpGuCU7UV9T7sJ779MgaTeWMGny1Xr4p2wv5oiLv0EGzkhRbQIc tUxcsUYyNbL0rD9C3aNmOQKUslIQs9+3CVi7QpYnWV0FDgoWogA1dum9efIafdty Esqg6k3sYDQWVGEYSvd3LPf4xtQ8QEjNLU4eOvTgG9wb3Chgu08mYhx028Q6Z3o3 Kxx52NlABvGxyuVAU5xoxMVeweo6eoq034uCQFYnZ1B+frcOugN0X3qLTldoBx8+ M+qlbCMvEDW38IrN4EeLgbJMHazeO6yW+qUlipjj0HBqwi5A5FyZ/NbRytCyJOj/ MNvBhrJTZs2gasc3MnDJcIz9H4O1bBrhXAYD2DjFWdjXnOYAJRQIa6pOSu/GTdgz MDTFA9ez93syNmOyqPoOov2Wlke8lPwM31AdPjoiXzsPlxykBQW65NOGs2LSjcI7 p+FGdbMlW77lRWcQC3mm4zOxcOZRb0mDxNXmGkbR5R2jrn+G8juEoUDaSBy8ja7s mgsxT7NKDQhvADdsV7EPJWKR0n7t77IYxFKFyFeI+zPa8bzKYmP/ZlgsoF4Imb7b YriSaWxQp29hT3o8zuk2V10W/GhJLwDeY1zJkD+dUOzDusjdWERLMrXEKcubzGGt MC2DD23aSoFckuFY4bQ= =qz5X -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-lisp-emacs-lisp-lisp-mode.el-Fix-parser-state-corrup.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix flet indentation >From 367ec048e7fbf6d7f3453a64e953079575444f4d Mon Sep 17 00:00:00 2001 From: akater Date: Mon, 8 Nov 2021 04:48:13 +0000 Subject: [PATCH] ; * lisp/emacs-lisp/lisp-mode.el: Fix parser state corruption. * lisp/emacs-lisp/lisp-mode.el (lisp--local-defform-body-p): Preserve the point * test/lisp/progmodes/elisp-mode-resources/flet.erts: Add corresponding test example --- lisp/emacs-lisp/lisp-mode.el | 13 +++++++------ test/lisp/progmodes/elisp-mode-resources/flet.erts | 10 ++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 15afdef0252..a5613e70e0a 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1148,12 +1148,13 @@ defun lisp--local-defform-body-p (state) ;; that starts a sexp. t) (point)))))) - (ignore-errors - ;; We rely on `backward-up-list' working - ;; even when sexp is incomplete =E2=80=9Cto the right=E2= =80=9D. - (backward-up-list 2) - t) - (=3D local-definitions-starting-point (point)))))))) + (save-excursion + (ignore-errors + ;; We rely on `backward-up-list' working + ;; even when sexp is incomplete =E2=80=9Cto the right= =E2=80=9D. + (backward-up-list 2) + t) + (=3D local-definitions-starting-point (point))))))))) =20 (defun lisp-indent-function (indent-point state) "This function is the normal value of the variable `lisp-indent-function= '. diff --git a/test/lisp/progmodes/elisp-mode-resources/flet.erts b/test/lisp= /progmodes/elisp-mode-resources/flet.erts index 7c4a0f304e9..da3dcb6ec3e 100644 --- a/test/lisp/progmodes/elisp-mode-resources/flet.erts +++ b/test/lisp/progmodes/elisp-mode-resources/flet.erts @@ -221,6 +221,16 @@ Name: flet15 i))) =3D-=3D-=3D =20 +Name: flet16 + +=3D-=3D +(cl-flet ((f (x) + (g x))) + (pcase e + ((dangerous-expression) + (form)))) +=3D-=3D-=3D + Name: flet-indentation-incomplete-sexp-no-side-effects-1 Code: (lambda () (emacs-lisp-mode) (setq indent-tabs-mode nil) (newline ni= l t)) Point-Char: | --=20 2.32.0 --=-=-=--