From 3630baae720842152c4d0df6692fabe8b3908203 Mon Sep 17 00:00:00 2001 From: Elias Gabriel Perez Date: Sun, 10 May 2026 10:14:21 -0600 Subject: [PATCH] hideshow: Support new 'margin' face for margin indicators. (Bug#80693) * lisp/progmodes/hideshow.el (hs-indicator-hide): Remove 'default' face. (hs--make-indicators-overlays): Rework. --- lisp/progmodes/hideshow.el | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index f781a82b105..44b50584bf4 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -299,7 +299,7 @@ use that face for the ellipsis instead." :version "31.1") (defface hs-indicator-hide - '((t :inherit (shadow default))) + '((t :inherit shadow)) "Face used in hideshow indicator to indicate a hidden block." :version "31.1") @@ -1094,14 +1094,16 @@ the overlay: `invisible' `hs'. Also, depending on variable `(left-fringe ,fringe-type ,face-or-icon))) ;; Margins ('margin - (propertize - "+" 'display - `((margin left-margin) - ,(or (plist-get (icon-elements face-or-icon) 'image) - (propertize (icon-string face-or-icon) - 'keymap hs-indicators-map))) - 'face face-or-icon - 'keymap hs-indicators-map)) + (let* ((icon-elements (icon-elements face-or-icon))) + (propertize + "+" 'display + `((margin left-margin) + ,(or (plist-get icon-elements 'image) + (propertize (plist-get icon-elements 'string) + 'face `(,face-or-icon margin) + 'keymap hs-indicators-map))) + 'face `(,face-or-icon margin) + 'keymap hs-indicators-map))) ;; EOL string ('nil (concat