From dbe23aec174001c42f6edc7a594863a82a24bcfa Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sun, 15 May 2022 13:56:37 -0400
Subject: [PATCH] lispy-test.el (lispy-toggle-threaded-last): Update for Emacs
 28

Starting with Emacs 28.1, thread-first uses `(declare (indent 0) ...)`
rather than `(declare (indent 1) ...)`.
---

  Proposed upstream at <https://github.com/abo-abo/lispy/pull/632>.

 lispy-test.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lispy-test.el b/lispy-test.el
index d946731..87d8c87 100644
--- a/lispy-test.el
+++ b/lispy-test.el
@@ -150,7 +150,13 @@ (ert-deftest lispy-toggle-threaded-last ()
                    "|(thread-last (a 1) (b 2) (c 3))"))
   (should (string= (lispy-with "|(equal 1443070800.0\n       (ts-unix\n        (ts-parse-org-element\n         (org-element-context))))"
                                (lispy-toggle-thread-last))
-                   "|(thread-last (org-element-context)\n  (ts-parse-org-element)\n  (ts-unix)\n  (equal 1443070800.0))"))
+                   (let ((indent (make-string
+                                  (if (version< emacs-version "28.1") 2 13)
+                                  ?\s)))
+                     (concat "|(thread-last (org-element-context)\n"
+                             indent "(ts-parse-org-element)\n"
+                             indent "(ts-unix)\n"
+                             indent "(equal 1443070800.0))"))))
   (should (string= (lispy-with "|(thread-last (org-element-context)\n  (ts-parse-org-element)\n  (ts-unix)\n  (equal 1443070800.0))"
                                (lispy-toggle-thread-last))
                    "|(equal 1443070800.0\n       (ts-unix\n        (ts-parse-org-element\n         (org-element-context))))")))

base-commit: df1b7e614fb0f73646755343e8892ddda310f427
-- 
2.36.0

t' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9d148d08be9d77781e8103915b1f498b03fd3dd2'>root</a>/<a href='/guix/log/tests?id=9d148d08be9d77781e8103915b1f498b03fd3dd2'>tests</a>/<a href='/guix/log/tests/guix-hash.sh?id=9d148d08be9d77781e8103915b1f498b03fd3dd2'>guix-hash.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-hash.sh?id=9d148d08be9d77781e8103915b1f498b03fd3dd2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-04-21 16:16:38 +0200'>2023-04-21</span></td><td><a href='/guix/commit/tests/guix-hash.sh?id=37dd69b44511dc73eb04bdebe8d82c9a0386338e'>tests: Fix checks for expected failures.</a><span class='msg-avail'>...<span class='msg-tooltip'>Addresses &lt;https://issues.guix.gnu.org/62406&gt;.

With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately.  Instead use '&amp;&amp; false' to indicate an expected failure.

* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... &amp;&amp; false' or `test ! ...` as appropriate.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Eric Bavier</td></tr>