Don't require cl at runtime. Require gnus-util at runtime.

Autoload nnimap and imap functions.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 44ccc3e..4a28c45 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-21  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * nnir.el: Don't require cl at runtime.  Require gnus-util at runtime.
+       Autoload nnimap and imap functions.
+
 2008-04-21  Justus Piater  <Justus-bulk@Piater.name>
 
        * nnir.el (nnir-compose-result): Use `gnus-replace-in-string' instead

diff --git a/contrib/nnir.el b/contrib/nnir.el
index f090a3e..f82b62d 100644 (file)
--- a/contrib/nnir.el
+++ b/contrib/nnir.el
@@ -338,17 +338,13 @@
 
 ;;; Setup Code:
 
-(require 'cl)
 (require 'nnoo)
 (require 'gnus-group)
 (require 'gnus-sum)
 (require 'message)
+(require 'gnus-util)
 (eval-and-compile
-  (require 'gnus-util))
-(eval-when-compile
-  (require 'nnimap))
-
-(autoload 'nnmaildir-base-name-to-article-number "nnmaildir")
+  (require 'cl))
 
 (nnoo-declare nnir)
 (nnoo-define-basics nnir)
@@ -864,6 +860,7 @@ and if it is non-nil, add it to artlist."
      (when (not (null result))
        (push result artlist))))
 
+(autoload 'nnmaildir-base-name-to-article-number "nnmaildir")
 
 ;; Helper function currently used by the Swish++ and Namazu backends;
 ;; perhaps useful for other backends as well
@@ -949,12 +946,15 @@ pairs (also vectors, actually)."
 ;; send queries as literals
 ;; handle errors
 
+(autoload 'nnimap-open-server "nnimap")
+(autoload 'imap-mailbox-select "imap")
+(autoload 'imap-search "imap")
+(autoload 'imap-quote-specials "imap")
+
 (defun nnir-run-imap (query srv &optional group-option)
   "Run a search against an IMAP back-end server.
 This uses a custom query language parser; see `nnir-imap-make-query' for
 details on the language and supported extensions"
-  (require 'imap)
-  (require 'nnimap)
   (save-excursion
     (let ((qstring (cdr (assq 'query query)))
          (server (cadr (gnus-server-to-method srv)))