ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX conflict resolution for empty lists

This commit is contained in:
Nathan Dwarshuis 2022-05-02 23:41:15 -04:00
parent 3d28aaa892
commit ff35f41ec5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
local/lib/org-x/org-x-dag.el
View File

@ -2278,11 +2278,11 @@ Return value is a list like (BUFFER NON-BUFFER)."
(cl-labels (cl-labels
((get-overlaps ((get-overlaps
(acc ss) (acc ss)
(-if-let (s0 (car ss))
(-let* (((acc+ acc-) acc) (-let* (((acc+ acc-) acc)
(s0 (car ss)) (A (cdr s0))
(A (cdr s0))) (a1 (cadr (car s0)))
(-if-let (rest (cdr ss)) (rest (cdr ss)))
(let ((a1 (cadr (car s0))))
;; add members while if the starting value is less than the ending ;; add members while if the starting value is less than the ending
;; value of the current member ;; value of the current member
(-if-let (over (->> (--take-while (< (car (car it)) a1) rest) (-if-let (over (->> (--take-while (< (car (car it)) a1) rest)
@ -2290,7 +2290,7 @@ Return value is a list like (BUFFER NON-BUFFER)."
(reverse))) (reverse)))
(get-overlaps `((,@over ,@acc+) ,acc-) rest) (get-overlaps `((,@over ,@acc+) ,acc-) rest)
(get-overlaps `(,acc+ (,A ,@acc-)) rest))) (get-overlaps `(,acc+ (,A ,@acc-)) rest)))
`(,acc+ (,A ,@acc-)))))) acc)))
(-let (((over non-over) (->> (-annotate interval-fun xs) (-let (((over non-over) (->> (-annotate interval-fun xs)
(--sort (< (car (car it)) (car (car other)))) (--sort (< (car (car it)) (car (car other))))
(get-overlaps nil)))) (get-overlaps nil))))