X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnagent.el;h=19892255a3cb6bdc65416d8153b38ac82699262c;hb=1a6d3c2c61e683afe1a993fc82fb0e824968433f;hp=50777aceb75b97a8c28f012cef78782bc7974d33;hpb=12880262125c73b531b08cd9005fbaf49c2c3395;p=elisp%2Fgnus.git-

diff --git a/lisp/nnagent.el b/lisp/nnagent.el
index 50777ac..1989225 100644
--- a/lisp/nnagent.el
+++ b/lisp/nnagent.el
@@ -1,5 +1,5 @@
 ;;; nnagent.el --- offline backend for Gnus
-;; Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997,98 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
@@ -58,18 +58,13 @@
 
 (nnoo-define-basics nnagent)
 
-(defun nnagent-server (server)
-  (and server (format "%s+%s" (car gnus-command-method) server)))
-
 (deffoo nnagent-open-server (server &optional defs)
   (setq defs
 	`((nnagent-directory ,(gnus-agent-directory))
 	  (nnagent-active-file ,(gnus-agent-lib-file "active"))
 	  (nnagent-newsgroups-file ,(gnus-agent-lib-file "newsgroups"))
 	  (nnagent-get-new-mail nil)))
-  (nnoo-change-server 'nnagent 
-		      (nnagent-server server)
-		      defs)
+  (nnoo-change-server 'nnagent server defs)
   (let ((dir (gnus-agent-directory))
 	err)
     (cond
@@ -78,7 +73,7 @@
 	     (ftp-error (setq err (format "%s" arg)))))
       (nnagent-close-server)
       (nnheader-report
-       'nnagent (or err
+       'nnagent (or err 
 		    (format "No such file or directory: %s" dir))))
      ((not (file-directory-p (file-truename dir)))
       (nnagent-close-server)
@@ -116,85 +111,7 @@
 
 (deffoo nnagent-request-post (&optional server)
   (gnus-agent-insert-meta-information 'news gnus-command-method)
-  (gnus-request-accept-article "nndraft:queue" nil t t))
-
-(deffoo nnagent-request-set-mark (group action server)
-  (with-temp-buffer
-    (insert (format "(%s-request-set-mark \"%s\" '%s \"%s\")\n"
-                    (nth 0 gnus-command-method) group action
-                    (or server (nth 1 gnus-command-method))))
-    (append-to-file (point-min) (point-max) (gnus-agent-lib-file "flags")))
-  nil)
-
-(deffoo nnagent-request-group (group &optional server dont-check)
-  (nnoo-parent-function 'nnagent 'nnml-request-group
-		    (list group (nnagent-server server) dont-check)))
-
-(deffoo nnagent-close-group (group &optional server)
-  (nnoo-parent-function 'nnagent 'nnml-close-group
-		    (list group (nnagent-server server))))
-
-(deffoo nnagent-request-accept-article (group &optional server last)
-  (nnoo-parent-function 'nnagent 'nnml-request-accept-article
-		    (list group (nnagent-server server) last)))
-
-(deffoo nnagent-request-article (id &optional group server buffer)
-  (nnoo-parent-function 'nnagent 'nnml-request-article
-		    (list id group (nnagent-server server) buffer)))
-
-(deffoo nnagent-request-create-group (group &optional server args)
-  (nnoo-parent-function 'nnagent 'nnml-request-create-group
-		    (list group (nnagent-server server) args)))
-
-(deffoo nnagent-request-delete-group (group &optional force server)
-  (nnoo-parent-function 'nnagent 'nnml-request-delete-group
-		    (list group force (nnagent-server server))))
-
-(deffoo nnagent-request-expire-articles (articles group &optional server force)
-  (nnoo-parent-function 'nnagent 'nnml-request-expire-articles
-		    (list articles group (nnagent-server server) force)))
-
-(deffoo nnagent-request-list (&optional server)
-  (nnoo-parent-function 'nnagent 'nnml-request-list 
-		    (list (nnagent-server server))))
-
-(deffoo nnagent-request-list-newsgroups (&optional server)
-  (nnoo-parent-function 'nnagent 'nnml-request-list-newsgroups 
-		    (list (nnagent-server server))))
-
-(deffoo nnagent-request-move-article 
-    (article group server accept-form &optional last)
-  (nnoo-parent-function 'nnagent 'nnml-request-move-article 
-		    (list article group (nnagent-server server) 
-			  accept-form last)))
-
-(deffoo nnagent-request-rename-group (group new-name &optional server)
-  (nnoo-parent-function 'nnagent 'nnml-request-rename-group 
-		    (list group new-name (nnagent-server server))))
-
-(deffoo nnagent-request-scan (&optional group server)
-  (nnoo-parent-function 'nnagent 'nnml-request-scan 
-		    (list group (nnagent-server server))))
-
-(deffoo nnagent-retrieve-headers (sequence &optional group server fetch-old)
-  (nnoo-parent-function 'nnagent 'nnml-retrieve-headers 
-		    (list sequence group (nnagent-server server) fetch-old)))
-
-(deffoo nnagent-set-status (article name value &optional group server)
-  (nnoo-parent-function 'nnagent 'nnml-set-status 
-		    (list article name value group (nnagent-server server))))
-
-(deffoo nnagent-server-opened (&optional server)
-  (nnoo-parent-function 'nnagent 'nnml-server-opened
-			(list (nnagent-server server))))
-
-(deffoo nnagent-status-message (&optional server)
-  (nnoo-parent-function 'nnagent 'nnml-status-message
-			(list (nnagent-server server))))
-
-(deffoo nnagent-request-regenerate (server)
-  (nnoo-parent-function 'nnagent 'nnml-request-regenerate
-			(list (nnagent-server server))))
+  (gnus-request-accept-article "nndraft:queue"))
 
 ;; Use nnml functions for just about everything.
 (nnoo-import nnagent