Wrap subst-char-in-string def in eval-and-compile.

(gnus-intersection, gnus-sorted-complement):  Autoload.

diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 67bbfa9957e3030c6735d797bd42686245a76b82..e3a98f36173fe58a1e33350e188b580833f3c792 100644 (file)
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -34,6 +34,9 @@
 
 (require 'mail-utils)
 (require 'mm-util)
+(eval-and-compile
+  (autoload 'gnus-intersection "gnus-range")
+  (autoload 'gnus-sorted-complement "gnus-range"))
 
 (defvar nnheader-max-head-length 4096
   "*Max length of the head of articles.")
@@ -693,20 +696,21 @@ without formatting."
       (apply 'insert format args))
     t))
 
-(if (fboundp 'subst-char-in-string)
-    (defsubst nnheader-replace-chars-in-string (string from to)
-      (subst-char-in-string from to string))
-  (defun nnheader-replace-chars-in-string (string from to)
-    "Replace characters in STRING from FROM to TO."
-    (let ((string (substring string 0))        ;Copy string.
-         (len (length string))
-         (idx 0))
-      ;; Replace all occurrences of FROM with TO.
-      (while (< idx len)
-       (when (= (aref string idx) from)
-         (aset string idx to))
-       (setq idx (1+ idx)))
-      string)))
+(eval-and-compile
+  (if (fboundp 'subst-char-in-string)
+      (defsubst nnheader-replace-chars-in-string (string from to)
+       (subst-char-in-string from to string))
+    (defun nnheader-replace-chars-in-string (string from to)
+      "Replace characters in STRING from FROM to TO."
+      (let ((string (substring string 0)) ;Copy string.
+           (len (length string))
+           (idx 0))
+       ;; Replace all occurrences of FROM with TO.
+       (while (< idx len)
+         (when (= (aref string idx) from)
+           (aset string idx to))
+         (setq idx (1+ idx)))
+       string))))
 
 (defun nnheader-replace-duplicate-chars-in-string (string from to)
   "Replace characters in STRING from FROM to TO."