X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-offline.el;h=0e1655ae015106c429a21bc73b715b87ccffc9e6;hb=e2696774a2e225ea60d46cc665d4232c80412731;hp=0e4d1a2a0713c8e100a9c644b6e5932bb946b8b9;hpb=1f2b93a24df7b9914dbbc1a26a6e76c8da6511d1;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-offline.el b/lisp/gnus-offline.el
index 0e4d1a2..0e1655a 100644
--- a/lisp/gnus-offline.el
+++ b/lisp/gnus-offline.el
@@ -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.
 ;;;
@@ -101,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"
   )
 
@@ -515,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.
@@ -607,7 +607,7 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
       (setq hdr (concat header " "))
       (setq str (concat hdr string))
       (setq hdr (concat str "\n"))
-      (insert-string hdr))))
+      (insert hdr))))
 ;;
 ;; Add X-Offline-Backend header.
 ;;
@@ -618,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)))))
 
 
 ;;
@@ -642,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."
@@ -787,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))
@@ -846,35 +846,13 @@ Please check your .emacs or .gnus.el to work nnspool fine.")
    ((featurep 'xemacs)
     (popup-menu menu))
    (t
-    (let ((menu-func (or (and (fboundp 'easy-menu-create-menu)
-			      'easy-menu-create-menu)
-			 'easy-menu-create-keymaps))
-	  keymap pop func)
-      (static-cond ((< emacs-major-version 20)
-		    ;; For Emacsen from 19.34 down to 19.28.
-		    ;; Seems the first item in MENU will be ignored.
-		    (or (keymapp menu)
-			(setq menu
-			      (append (list ""  ;; This will be ignored.
-					    (or title "Popup Menu")
-					    "-----"
-					    "-----")
-				      (cdr menu))))
-		    (setq keymap
-			  (if (keymapp menu)
-			      (append (list 'keymap
-					    (if title
-						`(nil ,title)
-					      '(nil "Popup Menu"))
-					    '(nil "")
-					    '(nil ""))
-				      (cdr menu))
-			    (funcall menu-func (car menu) (cdr menu)))))
-		   (t
-		    (setq keymap
-			  (if (keymapp menu)
-			      menu
-			    (funcall menu-func (car menu) (cdr menu))))))
+    (let* ((menu-func (or (and (fboundp 'easy-menu-create-menu)
+			       'easy-menu-create-menu)
+			  'easy-menu-create-keymaps))
+	   (keymap (if (keymapp menu)
+		       menu
+		     (funcall menu-func (car menu) (cdr menu))))
+	   pop func)
       ;; Display the popup menu.
       (if (and (setq pop (x-popup-menu t keymap))
 	       (setq func (lookup-key keymap