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))
5e3dcfd09bc884764b28deb'>tree</a><a href='/guix/commit/gnu/packages/tls.scm?id=af943b8104357e38e5e3dcfd09bc884764b28deb'>commit</a><a href='/guix/diff/gnu/packages/tls.scm?id=af943b8104357e38e5e3dcfd09bc884764b28deb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/tls.scm'>
<input type='hidden' name='id' value='af943b8104357e38e5e3dcfd09bc884764b28deb'/><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=af943b8104357e38e5e3dcfd09bc884764b28deb'>root</a>/<a href='/guix/log/gnu?id=af943b8104357e38e5e3dcfd09bc884764b28deb'>gnu</a>/<a href='/guix/log/gnu/packages?id=af943b8104357e38e5e3dcfd09bc884764b28deb'>packages</a>/<a href='/guix/log/gnu/packages/tls.scm?id=af943b8104357e38e5e3dcfd09bc884764b28deb'>tls.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/tls.scm?id=af943b8104357e38e5e3dcfd09bc884764b28deb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-07-20 10:11:35 +0200'>2023-07-20</span></td><td><a href='/guix/commit/gnu/packages/tls.scm?id=fb6f94864d1c1b3a6c46f3b880b8a51003854f89'>gnu: openssl-1.1: Fix shared build for the Hurd.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/tls.scm (openssl-1.1)[arguments]: When building for the Hurd,
add phase 'patch-configure'.
(openssl)[arguments]: And delete it again.
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-07-20 10:11:33 +0200'>2023-07-20</span></td><td><a href='/guix/commit/gnu/packages/tls.scm?id=378766dd2e7187d8ea48c47dd3fc53a7e66cf5c7'>gnu: openssl: Build fix for the Hurd.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/tls.scm (openssl-3.0)[arguments]: When building on the Hurd,
add "hurd-x86" to #:configure-flags.
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-06-25 23:46:04 +0200'>2023-06-25</span></td><td><a href='/guix/commit/gnu/packages/tls.scm?id=7e60061da3bda6d7ee328f2a22230189c749178a'>gnu: aws-lc: Fix tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/tls.scm (aws-lc)[native-inputs]: Add libfaketime.
[arguments]&lt;#:phases&gt;: Replace and wrap 'check with faketime due to
certificate expiration.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Greg Hogan</td></tr>
<tr><td><span title='2023-06-17 14:38:32 +0200'>2023-06-17</span></td><td><a href='/guix/commit/gnu/packages/tls.scm?id=ff690faf66d8f37ee6b679fcb7cf37e369624ee3'>gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/hurd.scm (hurd-target?): Remove.
(hurd-system?): Move to...
* guix/utils.scm (system-hurd?): ...here.
* gnu/packages/*: Update all users, removing (gnu packages hurd) include where
now unused.
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>