Require cl at compile time.

lisp/gnus/gnus-bcklg.el

@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 
 ;;;

lisp/gnus/gnus-cache.el

@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-int)
 (require 'gnus-range)

lisp/gnus/gnus-demon.el

@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-int)
 (require 'nnheader)

lisp/gnus/gnus-dup.el

@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-art)
 

lisp/gnus/gnus-range.el

@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 ;;; List and range functions
 
 (defun gnus-last-element (list)
@@ -207,7 +209,7 @@ Note: LIST has to be sorted over `<'."
 		    (setcar ranges (cons (car ranges)
 					 (cadr ranges)))
 		    (setcdr ranges (cddr ranges)))
-		(when (= (1+ (car ranges)) (caadr ranges))
+		(when (= (1+ (car ranges)) (car (cadr ranges)))
 		  (setcar (cadr ranges) (car ranges))
 		  (setcar ranges (cadr ranges))
 		  (setcdr ranges (cddr ranges)))))
@@ -216,8 +218,8 @@ Note: LIST has to be sorted over `<'."
 		(when (= (1+ (cdar ranges)) (cadr ranges))
 		  (setcdr (car ranges) (cadr ranges))
 		  (setcdr ranges (cddr ranges)))
-	      (when (= (1+ (cdar ranges)) (caadr ranges))
-		(setcdr (car ranges) (cdadr ranges))
+	      (when (= (1+ (cdar ranges)) (car (cadr ranges)))
+		(setcdr (car ranges) (cdr (cadr ranges)))
 		(setcdr ranges (cddr ranges))))))
 	(setq ranges (cdr ranges)))
       out)))

lisp/gnus/nnheader.el

@@ -37,6 +37,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'mail-utils)
 
 (defvar nnheader-max-head-length 4096