geekinney/tp
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Improve variable naming: rename face-to-subtract to remaining-face for clarity

Browse Source 
Co-authored-by: Kinneyzhang <38454496+Kinneyzhang@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-01-06 18:04:21 +00:00
parent 18b85e446a
commit aa53dc1b99
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tp.el
View File

@ -2097,8 +2097,8 @@ Returns a new string (original is not modified)."
(after (when (< end len) (after (when (< end len)
(substring str end len))) (substring str end len)))
(existing-props (text-properties-at start str)) (existing-props (text-properties-at start str))
;; Collect face contributions from layers to subtract ;; Remaining face after layer subtractions
(face-to-subtract nil) (remaining-face nil)
;; Track if face was modified by layer subtraction ;; Track if face was modified by layer subtraction
(face-was-modified nil) (face-was-modified nil)
;; Collect all properties to remove entirely (non-face or non-layer) ;; Collect all properties to remove entirely (non-face or non-layer)
@ -2106,13 +2106,13 @@ Returns a new string (original is not modified)."
;; Process each property to remove ;; Process each property to remove
(dolist (prop props-to-remove) (dolist (prop props-to-remove)
(if (tp--is-layer-name-p prop) (if (tp--is-layer-name-p prop)
;; Layer name - get its face contribution and add to subtract list ;; Layer name - get its face contribution and subtract from face
(let* ((layer-prop-value (plist-get existing-props prop)) (let* ((layer-prop-value (plist-get existing-props prop))
(layer-face (tp--get-layer-face-contribution prop layer-prop-value))) (layer-face (tp--get-layer-face-contribution prop layer-prop-value)))
;; Subtract layer's face from the current face ;; Subtract layer's face from the current face
(when layer-face (when layer-face
(let ((current-face (or face-to-subtract (plist-get existing-props 'face)))) (let ((current-face (or remaining-face (plist-get existing-props 'face))))
(setq face-to-subtract (setq remaining-face
(tp--subtract-face-from-face-value current-face layer-face)) (tp--subtract-face-from-face-value current-face layer-face))
;; Mark that we processed the face (even if result is nil) ;; Mark that we processed the face (even if result is nil)
(setq face-was-modified t))) (setq face-was-modified t)))
@ -2130,8 +2130,8 @@ Returns a new string (original is not modified)."
do (cond do (cond
;; Face property with layer subtraction ;; Face property with layer subtraction
((and (eq key 'face) face-was-modified) ((and (eq key 'face) face-was-modified)
(when face-to-subtract (when remaining-face
(setq result (plist-put result key face-to-subtract)))) (setq result (plist-put result key remaining-face))))
;; Property to remove entirely ;; Property to remove entirely
((memq key props-to-remove-entirely) ((memq key props-to-remove-entirely)
nil) ; skip nil) ; skip