Require cl at compile time.

diff --git a/lisp/gnus/gnus-bcklg.el b/lisp/gnus/gnus-bcklg.el
index 0f0fa5e96b21b5b5126bee16b73e95f146d7aff9..ead87fe19a3b6a8faffb74f91884d6b6a09ac168 100644 (file)
--- 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 c3e704fd6dddf40d9d68c67f18426cd1b6d33aae..3033ff41bd6fbfed6d682ce814cc14964a714a2b 100644 (file)
--- 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 09734c59cffa22a8a62d8975b04e67ce1a77c98e..c997b9107a41c3c4db527df334230db1c2776534 100644 (file)
--- 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 fe6b5d1bb8a92f66965b227ee6cc11b1c64657f9..dd0bce1f051dc910deb890b2da18df10d66e12a5 100644 (file)
--- 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 2ce1106e4993e96ec4a0579dd4556952fa451df5..54d92822e841c5ca0a6240481a61e53fce059b07 100644 (file)
--- 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 06b7b9e70cdf580deaad0f0fb733dbbbeb37af09..376bc9d7227d71f5e611d464d1f8b6d39318c1ed 100644 (file)
--- 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