From 46daf70c4a7ce208ab0b3a7893c042fed5f022c2 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 22 Mar 2022 15:35:05 +0100
Subject: [PATCH] Fix dependency problem in hl-line-sticky-flag

* lisp/hl-line.el (hl-line-sticky-flag): Open-code
hl-line-unhighlight to avoid recursive dependencies (bug#54481).
---
 lisp/hl-line.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 70ba0fcfc28..8c6b499f11d 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -75,7 +75,9 @@
              (dolist (buffer (buffer-list))
                (unless (eq buffer selected)
                  (with-current-buffer buffer
-                   (hl-line-unhighlight))))))))
+                   (when hl-line--overlay
+                     (delete-overlay hl-line--overlay)
+                     (setq hl-line--overlay nil)))))))))
 
 (defcustom hl-line-overlay-priority -50
   "Priority used on the overlay used by hl-line."
-- 
2.39.5