From 233e254bbe44f70ca899a506b3706af489228fda Mon Sep 17 00:00:00 2001
From: aagon <aymeric.agon@hotmail.fr>
Date: Thu, 10 Aug 2023 20:03:52 +0200
Subject: [PATCH] Repair helpful--display-implementations test for emacs 29.1

---
 test/helpful-unit-test.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el
index 0f5177b..0716b0d 100644
--- a/test/helpful-unit-test.el
+++ b/test/helpful-unit-test.el
@@ -1089,8 +1089,12 @@ find the source code."
   (require 'xref)
   (helpful-function 'xref-location-marker)
   (should (s-contains-p "Implementations" (buffer-string)))
-  (should (s-contains-p "((l xref-file-location))" (buffer-string)))
-  (should (s-contains-p "((l xref-buffer-location))" (buffer-string))))
+  (should (if (version< emacs-version "29.1")
+	      (s-contains-p "((l xref-file-location))" (buffer-string))
+	    (s-contains-p "(xref-location-marker (L xref-file-location))" (buffer-string))))
+  (should (if (version< emacs-version "29.1")
+	      (s-contains-p "((l xref-buffer-location))" (buffer-string))
+	    (s-contains-p "(xref-location-marker (L xref-buffer-location))" (buffer-string)))))
 
 (defun helpful--boring-advice (orig-fn &rest args)
   (apply orig-fn args))
396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'>tree</a><a href='/guix/commit/gnu/packages/openpgp.scm?id=9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'>commit</a><a href='/guix/diff/gnu/packages/openpgp.scm?id=9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/openpgp.scm'>
<input type='hidden' name='id' value='9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' 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=9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'>root</a>/<a href='/guix/log/gnu?id=9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'>gnu</a>/<a href='/guix/log/gnu/packages?id=9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'>packages</a>/<a href='/guix/log/gnu/packages/openpgp.scm?id=9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e'>openpgp.scm</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/gnu/packages/openpgp.scm?id=9396fef40998ba6b580b2d6c5c7b774b7a6ccd1e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/openpgp.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-07-29 00:22:01 +0200'>2020-07-29</span></td><td><a href='/guix/commit/gnu/packages/openpgp.scm?id=7b7543376bd495c269536d04d97b381ad89da5c4'>gnu: Add rnp.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/openpgp.scm (rnp): New variable.
* gnu/packages/patches/rnp-add-version.cmake.patch: New file.
* gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch: New file.
* gnu/packages/patches/rnp-unbundle-googletest.patch: New file.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Justus Winter</td></tr>
<tr><td><span title='2020-07-24 14:21:31 +0200'>2020-07-24</span></td><td><a href='/guix/commit/gnu/packages/openpgp.scm?id=39222080911eaf3d7f74effe4467c1a04464aef3'>gnu: Add dkgpg.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/openpgp.scm (dkgpg): New variable.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Justus Winter</td></tr>
<tr><td><span title='2020-07-24 14:21:31 +0200'>2020-07-24</span></td><td><a href='/guix/commit/gnu/packages/openpgp.scm?id=d51cb7f85f051b02d6e59829a7f9eb30ff044ad5'>gnu: Add libtmcg.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/openpgp.scm: New file.

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