Changes committed gnus/contrib (ChangeLog nnir.el)

Modified: ChangeLog nnir.el

Don't require cl at runtime.  Require gnus-util at runtime.
Autoload nnimap and imap functions.


Index: ChangeLog
diff -u gnus/contrib/ChangeLog:7.66 gnus/contrib/ChangeLog:7.67
--- ChangeLog:7.66	Mon Apr 21 18:33:54 2008
+++ ChangeLog	Mon Apr 21 18:37:45 2008
@@ -1,3 +1,8 @@
+2008-04-21  Reiner Steib  <[email protected]>
+
+	* nnir.el: Don't require cl at runtime.  Require gnus-util at runtime.
+	Autoload nnimap and imap functions.
+
 2008-04-21  Justus Piater  <[email protected]>
 
 	* nnir.el (nnir-compose-result): Use `gnus-replace-in-string' instead
Index: nnir.el
diff -u gnus/contrib/nnir.el:7.29 gnus/contrib/nnir.el:7.30
--- nnir.el:7.29	Mon Apr 21 18:33:54 2008
+++ nnir.el	Mon Apr 21 18:37:45 2008
@@ -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 @@
      (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 @@
 ;; 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)))