Use cl-caddr instead of caddr

Hopefully fixes #409.

Reported-By: @lysxia

3 files changed, 6 insertions, 6 deletions

diff --git a/coq/coq.el b/coq/coq.el
index 9fe52532..c7163769 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -1347,7 +1347,7 @@ redisplayed."
       (proof-shell-invisible-command (format "Set Printing Width %S." (- wdth 1)) t)
       (setq coq-shell-current-line-width wdth)
       ;; Show iff show non nil and some proof is under way
-      (when (and show (not (null (caddr (coq-last-prompt-info-safe)))))
+      (when (and show (not (null (cl-caddr (coq-last-prompt-info-safe)))))
         (proof-shell-invisible-command (format "Show.") t nil 'no-error-display)))))
 
 (defun coq-adapt-printing-width-and-show(&optional show width)
@@ -1453,7 +1453,7 @@ Maintained by a hook in `proof-shell-handle-delayed-output-hook'.")
          (positions (cdr hyp-positions))
          (begcross (car positions))
          (beghypname (cadr positions))
-         (endhypname (caddr positions))
+         (endhypname (cl-caddr positions))
          (beg (cadddr positions))
          (end (cadddr (cdr positions))))
     (let ((hypnameov (coq-make-hypname-overlay beghypname endhypname fstname buf))
diff --git a/generic/pg-pbrpm.el b/generic/pg-pbrpm.el
index 619a5d6c..bc95f2ac 100644
--- a/generic/pg-pbrpm.el
+++ b/generic/pg-pbrpm.el
@@ -377,7 +377,7 @@ Returns (n . s) where
     (while (and pos l (not found))
       (setq start-goal (car l))
       (setq end-goal (cadr l))
-      (setq goal-name (caddr l))
+      (setq goal-name (cl-caddr l))
       (setq start-concl (cadddr l))
       (setq hyps (car (cddddr l)))
       (setq l (cdr (cddddr l)))
@@ -393,7 +393,7 @@ Returns (n . s) where
 	    (while (and hyps (not found))
 	      (setq start-hyp (car hyps))
 	      (setq start-hyp-text (cadr hyps))
-	      (setq end-hyp (caddr hyps))
+	      (setq end-hyp (cl-caddr hyps))
 	      (setq hyp-name (cadddr hyps))
 	      (setq hyps (cddddr hyps))
 	      (if (and (<= start-hyp pos) (<= pos end-hyp))
diff --git a/generic/proof-menu.el b/generic/proof-menu.el
index e43efcc0..ffd80415 100644
--- a/generic/proof-menu.el
+++ b/generic/proof-menu.el
@@ -793,7 +793,7 @@ suitable for adding to the proof assistant menu."
   (let*
       ((favs       (proof-ass favourites))
        (rmfavs	   (cl-remove-if
-		    (lambda (f) (string-equal menuname (caddr f)))
+		    (lambda (f) (string-equal menuname (cl-caddr f)))
 		    favs)))
     (unless (equal favs rmfavs)
       (easy-menu-remove-item proof-assistant-menu
@@ -835,7 +835,7 @@ KEY is the optional key binding."
       ((menu-entry (proof-def-favourite command inscript menuname key t))
        (favs       (proof-ass favourites))
        (rmfavs	   (cl-remove-if
-		    (lambda (f) (string-equal menuname (caddr f)))
+		    (lambda (f) (string-equal menuname (cl-caddr f)))
 		    favs))
        (newfavs    (append
 		    rmfavs