branch: externals/auto-overlays
commit 8108af97b95a7863b0eacc2d7804f5e69b04ab26
Author: Toby Cubitt <[email protected]>
Commit: tsc25 <[email protected]>
Replaced a couple of cl functions that had crept in.
---
auto-overlays.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/auto-overlays.el b/auto-overlays.el
index d266319..ebfa858 100644
--- a/auto-overlays.el
+++ b/auto-overlays.el
@@ -909,7 +909,7 @@ was saved."
;; optimisation almost certainly isn't worth the effort.
(catch 'found
(while (cdr pending)
- (when (<= start (caadr pending)) (throw 'found t))
+ (when (<= start (car (cadr pending))) (throw 'found t))
(setq pending (cdr pending))))
;; if start of new entry is before end of entry it should come after,
;; merge it with that entry
@@ -924,8 +924,8 @@ was saved."
;; before start of next entry
;; (See above note about O(n) vs. O(log n))
(while (and (cdr pending)
- (>= (1+ (cdar pending)) (caadr pending)))
- (setcdr (car pending) (max (cdar pending) (cdadr pending)))
+ (>= (1+ (cdar pending)) (car (cadr pending))))
+ (setcdr (car pending) (max (cdar pending) (cdr (cadr pending))))
(setcdr pending (cddr pending)))
))
)
