emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/indent-bars 62d4a834b7 282/431: Restore use of base sti


From: ELPA Syncer
Subject: [elpa] externals/indent-bars 62d4a834b7 282/431: Restore use of base stipple-face-spec
Date: Mon, 16 Sep 2024 12:59:39 -0400 (EDT)

branch: externals/indent-bars
commit 62d4a834b7c82ac7a4d94bd70677e79c9cbe5cde
Author: JD Smith <93749+jdtsmith@users.noreply.github.com>
Commit: JD Smith <93749+jdtsmith@users.noreply.github.com>

    Restore use of base stipple-face-spec
    
    Needed for character-based bars, for which there are no remaps applied.
---
 indent-bars.el | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/indent-bars.el b/indent-bars.el
index 982b7f0727..f29ab7dfef 100644
--- a/indent-bars.el
+++ b/indent-bars.el
@@ -651,12 +651,15 @@ color, if setup (see 
`indent-bars-highlight-current-depth')."
 (defun indent-bars--stipple-face-spec (w h rot &optional style stipple)
   "Create a face specification for the stipple face for STYLE.
 Create for character size W x H with offset ROT.  If STIPPLE is
-non-nil, use it instead of calculating."
-  (let ((stipple (or stipple (indent-bars--stipple w h rot style))))
-    (when stipple
-      `((t ( :inherit nil :stipple ,stipple
-            ,@(when indent-bars-no-stipple-char-font-weight
-                `(:weight ,indent-bars-no-stipple-char-font-weight))))))))
+non-nil, use it instead of calculating.  Includes
+:weight (affecting only non-stipple character display) if
+`indent-bars-no-stipple-char-font-weight' (or equivalent for the
+STYLE) is non-nil."
+  (let ((stipple (or stipple (indent-bars--stipple w h rot style)))
+       (wt (indent-bars--style style "no-stipple-char-font-weight")))
+    `((t ( :inherit nil
+          ,@(and stipple `(:stipple ,stipple))
+          ,@(and wt `(:weight ,wt)))))))
 
 (defun indent-bars--calculate-face-spec (style depth)
   "Calculate the face spec for bar at DEPTH in STYLE.
@@ -850,7 +853,12 @@ Useful for calling after theme changes."
        (ibs/no-stipple-chars style) (indent-bars--create-no-stipple-chars 
style 7))
   
   ;; Base stipple face
-  (face-spec-set (ibs/stipple-face style) nil) ;stipple only via filtered 
remaps
+  (face-spec-set
+   (ibs/stipple-face style)
+   (indent-bars--stipple-face-spec
+    (frame-char-width) (frame-char-height)
+    (indent-bars--stipple-rot (selected-window) (frame-char-width))
+    style))
   
   ;; Current depth highlight faces/stipple
   (setf (ibs/current-bg-color style)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]