X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-offline.el;h=a30b47dc5d1225a9a00b73a904263151bbd11306;hb=9b741e050b400987d68ff761c6cc3276c932839c;hp=63e6c74bea4f332d04469e3481e965dc902ae3d7;hpb=2cc5659442ce551b395b9aeebe213947e415ac6d;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 63e6c74..a30b47d 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -1,7 +1,7 @@
 ;;; gnus-offline.el --- To process mail & news at offline environment.
 
-;;; Copyright (C) 1998 Tatsuya Ichikawa
-;;;                    Yukihiro Ito
+;;; Copyright (C) 1998, 2001 Tatsuya Ichikawa
+;;; Copyright (C) 1998, 2001 Yukihiro Ito
 ;;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
 ;;;         Yukihiro Ito <ito@rs.civil.tohoku.ac.jp>
 ;;;         Hidekazu Nakamura <u90121@uis-inf.co.jp>
@@ -36,7 +36,7 @@
 ;;; Note.
 ;;;   This file works only with after version of Emacs 19.30.
 ;;;   This file needs miee.el and SEMI.
-;;;   If you set gnus-offline-drafts-queue-type to 'agent , you don't need 
+;;;   If you set gnus-offline-drafts-queue-type to 'agent , you don't need
 ;;;   miee.el
 ;;;   You must use T-gnus 6.12.0 or later.
 ;;;
@@ -78,7 +78,6 @@
 (eval '(run-hooks 'gnus-offline-load-hook))
 
 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'gnus-clfns))
 
 (eval-when-compile
   (require 'static)
@@ -102,7 +101,7 @@
 ;;  "A matter of trust"
 ;;  "Modern Woman"
 ;;  "Ahhhhhhh!!"		; 2.10b1
-  "Cup of life"                 ; 2.20
+  "Cup of life"			; 2.20
 ;;  "Code of silence"
   )
 
@@ -110,17 +109,11 @@
 				       gnus-offline-version-number))
 
 (eval-when-compile
-  (mapc
-   (lambda (symbol)
-     (unless (boundp symbol)
-       (make-local-variable symbol)
-       (eval (list 'setq symbol nil))))
-   '(nnagent-version
-     nnspool-version
-     msspool-news-server
-     msspool-news-service
-     miee-popup-menu
-     gnus-group-toolbar)))
+  (defvar nnagent-version)
+  (defvar nnspool-version)
+  (defvar msspool-news-server)
+  (defvar msspool-news-service)
+  (defvar miee-popup-menu))
 
 (if (featurep 'meadow)
     (define-process-argument-editing "/hang\\.exe\\'"
@@ -522,7 +515,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   ;; fetch only mail for gnus-agent
   (if (and (eq gnus-offline-news-fetch-method 'nnagent)
 	   (eq gnus-offline-articles-to-fetch 'mail))
-	  (setq gnus-agent-handle-level gnus-offline-mail-group-level)))
+      (setq gnus-agent-handle-level gnus-offline-mail-group-level)))
 
 ;;
 ;; Change mail group level to handle only mail.
@@ -625,8 +618,8 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 		    nnagent-version
 		  nnspool-version))
 	   (str (format "\n                        with %s" ver)))
-    (gnus-offline-add-custom-header
-     "X-Gnus-Offline-Backend:" (concat gnus-offline-header-string str)))))
+      (gnus-offline-add-custom-header
+       "X-Gnus-Offline-Backend:" (concat gnus-offline-header-string str)))))
 
 
 ;;
@@ -649,7 +642,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
   ;;
   (setenv "MAILHOST" nil))
 ;;
-;; Hangup line function 
+;; Hangup line function
 ;;
 (defun gnus-offline-hangup-line ()
   "*Hangup line function."
@@ -794,7 +787,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 	(message "%s" (gnus-offline-gettext 'empting-spool-4)))
     ;; Send queued message by gnus-agent
     (message "%s" (gnus-offline-gettext 'empting-spool-5))
-    (gnus-group-send-drafts)
+    (gnus-group-send-queue)
     (message "%s" (gnus-offline-gettext 'empting-spool-6)))
   ;;
   (run-hooks 'gnus-offline-after-empting-spool-hook))
@@ -889,13 +882,16 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
 	  (funcall func))))))
 
 (defun gnus-offline-get-menu-items (list)
-  (mapcar
-   #'(lambda (el)
-       (if (listp el)
-	   (apply 'vector
-		  (cons (gnus-offline-gettext (car el)) (cdr el)))
-	 el))
-   list))
+  (let (result)
+    (dolist (elem list)
+      (setq result
+	    (nconc result
+		   (list (if (listp elem)
+			     (progn
+			       (setcar elem (gnus-offline-gettext (car elem)))
+			       (vconcat elem))
+			   elem)))))
+    result))
 
 (defvar gnus-offline-menu
   (gnus-offline-get-menu-items