Require cl at compile time.

6 files changed, 15 insertions, 3 deletions

diff --git a/lisp/gnus/gnus-bcklg.el b/lisp/gnus/gnus-bcklg.el
index 0f0fa5e96b2..ead87fe19a3 100644
--- a/lisp/gnus/gnus-bcklg.el
+++ b/lisp/gnus/gnus-bcklg.el
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 
 ;;;
diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el
index c3e704fd6dd..3033ff41bd6 100644
--- a/lisp/gnus/gnus-cache.el
+++ b/lisp/gnus/gnus-cache.el
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-int)
 (require 'gnus-range)
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 09734c59cff..c997b9107a4 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-int)
 (require 'nnheader)
diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el
index fe6b5d1bb8a..dd0bce1f051 100644
--- a/lisp/gnus/gnus-dup.el
+++ b/lisp/gnus/gnus-dup.el
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-art)
 
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 2ce1106e499..54d92822e84 100644
--- a/lisp/gnus/gnus-range.el
+++ b/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)))
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 06b7b9e70cd..376bc9d7227 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -37,6 +37,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'mail-utils)
 
 (defvar nnheader-max-head-length 4096