From 2ab20374892220cc0979a7999026da98ecf9b4c1 Mon Sep 17 00:00:00 2001 From: Clément Pit-Claudel Date: Sat, 15 Dec 2018 17:08:37 -0500 Subject: Prepend cl- to more c[ad]+r instances --- coq/coq.el | 4 ++-- generic/pg-pbrpm.el | 10 +++++----- generic/proof-depends.el | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coq/coq.el b/coq/coq.el index c7163769..c7aa4b22 100644 --- a/coq/coq.el +++ b/coq/coq.el @@ -1454,8 +1454,8 @@ Maintained by a hook in `proof-shell-handle-delayed-output-hook'.") (begcross (car positions)) (beghypname (cadr positions)) (endhypname (cl-caddr positions)) - (beg (cadddr positions)) - (end (cadddr (cdr positions)))) + (beg (cl-cadddr positions)) + (end (cl-cadddr (cdr positions)))) (let ((hypnameov (coq-make-hypname-overlay beghypname endhypname fstname buf)) (hypov (coq-make-hyp-overlay beg end fstname buf)) (crosshypov (coq-make-hypcross-overlay begcross (+ 1 begcross) fstname buf)) diff --git a/generic/pg-pbrpm.el b/generic/pg-pbrpm.el index bc95f2ac..f1f83ff1 100644 --- a/generic/pg-pbrpm.el +++ b/generic/pg-pbrpm.el @@ -378,9 +378,9 @@ Returns (n . s) where (setq start-goal (car l)) (setq end-goal (cadr l)) (setq goal-name (cl-caddr l)) - (setq start-concl (cadddr l)) - (setq hyps (car (cddddr l))) - (setq l (cdr (cddddr l))) + (setq start-concl (cl-cadddr l)) + (setq hyps (car (cl-cddddr l))) + (setq l (cdr (cl-cddddr l))) (if (and (<= start-goal pos) (<= pos end-goal)) (progn (setq found t) @@ -394,8 +394,8 @@ Returns (n . s) where (setq start-hyp (car hyps)) (setq start-hyp-text (cadr hyps)) (setq end-hyp (cl-caddr hyps)) - (setq hyp-name (cadddr hyps)) - (setq hyps (cddddr hyps)) + (setq hyp-name (cl-cadddr hyps)) + (setq hyps (cl-cddddr hyps)) (if (and (<= start-hyp pos) (<= pos end-hyp)) (progn (setq found t) diff --git a/generic/proof-depends.el b/generic/proof-depends.el index 9f3b469a..372ce06b 100644 --- a/generic/proof-depends.el +++ b/generic/proof-depends.el @@ -241,7 +241,7 @@ This is simply to display the dependency somehow." (defun proof-highlight-depcs (name nmspans) (let ((helpmsg (concat "This item is a dependency (ancestor) of " name))) (while nmspans - (let ((span (cadar nmspans))) + (let ((span (cl-cadar nmspans))) (proof-depends-save-old-face span) (span-set-property span 'face 'proof-highlight-dependency-face) ;; (span-set-property span 'priority pg-dep-span-priority) @@ -252,7 +252,7 @@ This is simply to display the dependency somehow." (defun proof-highlight-depts (name nmspans) (let ((helpmsg (concat "This item depends on (is a child of) " name))) (while nmspans - (let ((span (cadar nmspans))) + (let ((span (cl-cadar nmspans))) (proof-depends-save-old-face span) (span-set-property span 'face 'proof-highlight-dependent-face) ;; (span-set-property span 'priority pg-dep-span-priority) -- cgit v1.2.3