From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 13 Oct 2022 08:08:55 +0000 (+0200)
Subject: Fix hl-line-mode/global-hl-line-mode logic again
X-Git-Tag: emacs-29.0.90~1616^2~642
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=12f261c4708d58362c9e080a686b0e41821c6db8;p=emacs.git

Fix hl-line-mode/global-hl-line-mode logic again

* lisp/hl-line.el (hl-line-mode): Make explicit calls to
(hl-line-mode 1) work again when global-hl-line-mode is on
(bug#58478).
---

diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 693c94eea8c..87bea1017f1 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -156,7 +156,8 @@ line about point in the selected window only."
   :group 'hl-line
   ;; If the global mode is switched on, then `M-x hl-line-mode' should
   ;; switch the mode off in this buffer.
-  (when global-hl-line-mode
+  (when (and global-hl-line-mode
+             (eq arg 'toggle))
     (setq hl-line-mode nil)
     (setq-local global-hl-line-mode nil)
     (global-hl-line-unhighlight))