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 09:36:39 +0000 Message-ID: <87zgqf7zvc.fsf@gmail.com> References: <504153FB-8633-4755-A91A-DF5DD64E6FAA@acm.org> <87lf3fntdx.fsf@gmail.com> <878rxz8n6b.fsf_-_@web.de> <875yt39nmk.fsf@gmail.com> <877ddj9moq.fsf@gnus.org> <8735o79mpg.fsf@gmail.com> <87tugn87fp.fsf@gnus.org> 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="37251"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 9622@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 08 10:49:12 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 1mk1H6-0009Up-1b for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 08 Nov 2021 10:49:12 +0100 Original-Received: from localhost ([::1]:57746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mk1H5-000877-0J for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 08 Nov 2021 04:49:11 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:36500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mk1Gw-00085q-6n for bug-gnu-emacs@gnu.org; Mon, 08 Nov 2021 04:49:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mk1Gv-0003Ck-Sh for bug-gnu-emacs@gnu.org; Mon, 08 Nov 2021 04:49:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mk1Gv-0005Cj-R8 for bug-gnu-emacs@gnu.org; Mon, 08 Nov 2021 04:49:01 -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 09:49:01 +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.163636490019955 (code B ref 9622); Mon, 08 Nov 2021 09:49:01 +0000 Original-Received: (at 9622) by debbugs.gnu.org; 8 Nov 2021 09:48:20 +0000 Original-Received: from localhost ([127.0.0.1]:56462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mk1GG-0005Bm-Gj for submit@debbugs.gnu.org; Mon, 08 Nov 2021 04:48:20 -0500 Original-Received: from mail-lf1-f45.google.com ([209.85.167.45]:39582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mk1GE-0005BY-1c for 9622@debbugs.gnu.org; Mon, 08 Nov 2021 04:48:19 -0500 Original-Received: by mail-lf1-f45.google.com with SMTP id d12so31211830lfv.6 for <9622@debbugs.gnu.org>; Mon, 08 Nov 2021 01:48:17 -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=OrtA24xvJN6E2gXAgsi01sHQd8sX7R0bikgq4EsUye8=; b=DqAGcK2qWXHTEEuHvIEz1llaZusdvvf4ZEX3Fv3gQ/I+uh00gKN6XNvUu32swuaHu2 kv7hCkrVTpzstmRhbrdTMj+IcW/j8Sis6G8XjY27TDbBrBVBI7zkCLeSoYl+gbGQBow5 kgJ6KiYpClz5sybADtNSSXS3fIUCQdSfMOCiJKq3U1gPtW+Rz5oXOinvU5VF3OA7cJ7c cvt3xRtp0y6Q6bBSxYms9w1rFGj4PTlntoTks9T8Oor1lIgfi14zPMsoET6AJfbTY4HA /juZZPrLYLX/tcqOmyUdrRmSv5CVuH3rcuVSd6dHqnPfZxBDIixU/1N8Lif3Pp+cChZi q0sA== 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=OrtA24xvJN6E2gXAgsi01sHQd8sX7R0bikgq4EsUye8=; b=CyeTQdJP6ho9X8k/6dflY0ZS+pRMNChoZsizhlNgH74rOAV5qTHuirVKigcJ9ekfw+ h4vZJhkCLxIZ257yOGzOFO1NAu6C4WIJprXemiSVGHFXei1FqoPddDPCDiTcpE+I+MsL 0/RvKZhibQOtkLxImqSAI7yMC9G6R7UU9zULOVbs9FlBx31ifEVOwJnnYhosELGyIywb BMCsZjeJ6jjovBmq5GzllVNtlt9CTQSqQilwZqc+f2Wg5r5LRbWBU93GPii+SOU9X0oc Ul1O2EkYRABjhvyfDRvsceHOiHrBrS+kai+yKgcJkMZn3+K5LtcCZ8e/9OBmEgfvifUD 9fZQ== X-Gm-Message-State: AOAM533fTJ92ALQkzbKuTKvCETtSaeOsWXnqCmDdyxHp7/cEepyWxvDc W7oXZe7Ngi5q/qZpjxMqmXo= X-Google-Smtp-Source: ABdhPJyFLoIgDwKMI7CmzzgavjkEYjJsQlJPlho4iDMaPxCCK0KuiOYc356fo2yCa7KGWdQ9KacMcQ== X-Received: by 2002:a05:6512:3887:: with SMTP id n7mr71954995lft.356.1636364892007; Mon, 08 Nov 2021 01:48:12 -0800 (PST) Original-Received: from localhost ([185.83.214.69]) by smtp.googlemail.com with ESMTPSA id o11sm1757422lfr.98.2021.11.08.01.48.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 01:48:11 -0800 (PST) In-Reply-To: <87tugn87fp.fsf@gnus.org> 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:219341 Archived-At: --=-=-= Content-Type: text/plain Lars Ingebrigtsen writes: > akater 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. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-lisp-emacs-lisp-lisp-mode.el-Restore-one-check.patch Content-Transfer-Encoding: quoted-printable Content-Description: Fix flet indntation >From 2a988ef49e1ea954a99e4c123301165764feebac 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: 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 =E2=80=9Cto the right= =E2=80=9D. - (backward-up-list 2) - t) - (=3D local-definitions-starting-point (point))))))))) + (when (ignore-errors + ;; We rely on `backward-up-list' working + ;; even when sexp is incomplete =E2=80=9Cto the r= ight=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= '. --=20 2.32.0 --=-=-=--