(gnus-offline-update-setting-file): Don't rely on `gnus-load-hook'.

(gnus): New advice. Call `gnus-offline-setup' when everything is done.

diff --git a/lisp/gnus-ofsetup.el b/lisp/gnus-ofsetup.el
index e6d05a1..c31c565 100644 (file)
--- a/lisp/gnus-ofsetup.el
+++ b/lisp/gnus-ofsetup.el
@@ -45,6 +45,7 @@
     "This variable decides which language will be used for display."))
 
 (eval-when-compile
+  (require 'gnus)
   (require 'gnus-offline))
 
 (defvar gnus-offline-setting-file
@@ -160,8 +161,6 @@
                        "(add-hook"
                        "'message-send-hook"
                        "'gnus-offline-message-add-header)"))
-       (insert "(autoload 'gnus-offline-setup \"gnus-offline\")\n")
-       (insert "(add-hook 'gnus-load-hook 'gnus-offline-setup)\n")
 
        ;; Write stting about mail-source.el
        (insert "(setq gnus-offline-mail-source '"
@@ -524,6 +523,7 @@ mail source specifier \e$B$H$+>e5-$N$h$&$J%-!<%o!<%I$K$D$$$F$b$C$H$h$/\e(B
       (gnus-ofsetup-prepare gnus-ofsetup-update-setting-file)))
   (load gnus-offline-setting-file))
 
+
 ;; Suppport for customizing gnus-ofsetup parameters.
 
 (defvar sendmail-to-spool-directory)
@@ -721,4 +721,12 @@ mail source specifier \e$B$H$+>e5-$N$h$&$J%-!<%o!<%I$K$D$$$F$b$C$H$h$/\e(B
   (bury-buffer)
   (switch-to-buffer gnus-group-buffer))
 
+
+;;; Code for making Gnus and Gnus Offline cooperate with each other.
+
+;; advice.
+(defadvice gnus (around gnus-ofsetup-advice activate preactivate)
+  "Setup offline environment when Gnus is invoked."
+  (require 'gnus-offline) ad-do-it (gnus-offline-setup))
+
 ;; gnus-ofsetup.el Ends here.