Upgrading to Gnus 5.7; see ChangeLog

1 files changed, 105 insertions, 106 deletions

diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index 5f2cb9afbe5..c6f23c41026 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -1,7 +1,7 @@
 ;;; nndraft.el --- draft article access for Gnus
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -26,22 +26,30 @@
 ;;; Code:
 
 (require 'nnheader)
+(require 'nnmail)
+(require 'gnus-start)
 (require 'nnmh)
 (require 'nnoo)
-(eval-and-compile (require 'cl))
+(eval-when-compile
+  (require 'cl)
+  ;; This is just to shut up the byte-compiler.
+  (fset 'nndraft-request-group 'ignore))
 
-(nnoo-declare nndraft)
+(nnoo-declare nndraft
+  nnmh)
 
-(eval-and-compile
-  (autoload 'mail-send-and-exit "sendmail"))
-
-(defvoo nndraft-directory nil
-  "Where nndraft will store its directory.")
+(defvoo nndraft-directory (nnheader-concat gnus-directory "drafts/")
+  "Where nndraft will store its files."
+  nnmh-directory)
 
 
 
+(defvoo nndraft-current-group "" nil nnmh-current-group)
+(defvoo nndraft-get-new-mail nil nil nnmh-get-new-mail)
+(defvoo nndraft-current-directory nil nil nnmh-current-directory)
+
 (defconst nndraft-version "nndraft 1.0")
-(defvoo nndraft-status-string "")
+(defvoo nndraft-status-string "" nil nnmh-status-string)
 
 
 
@@ -49,7 +57,23 @@
 
 (nnoo-define-basics nndraft)
 
+(deffoo nndraft-open-server (server &optional defs)
+  (nnoo-change-server 'nndraft server defs)
+  (cond
+   ((not (file-exists-p nndraft-directory))
+    (nndraft-close-server)
+    (nnheader-report 'nndraft "No such file or directory: %s"
+		     nndraft-directory))
+   ((not (file-directory-p (file-truename nndraft-directory)))
+    (nndraft-close-server)
+    (nnheader-report 'nndraft "Not a directory: %s" nndraft-directory))
+   (t
+    (nnheader-report 'nndraft "Opened server %s using directory %s"
+		     server nndraft-directory)
+    t)))
+
 (deffoo nndraft-retrieve-headers (articles &optional group server fetch-old)
+  (nndraft-possibly-change-group group)
   (save-excursion
     (set-buffer nntp-server-buffer)
     (erase-buffer)
@@ -79,24 +103,8 @@
 	(nnheader-fold-continuation-lines)
 	'headers))))
 
-(deffoo nndraft-open-server (server &optional defs)
-  (nnoo-change-server 'nndraft server defs)
-  (unless (assq 'nndraft-directory defs)
-    (setq nndraft-directory server))
-  (cond
-   ((not (file-exists-p nndraft-directory))
-    (nndraft-close-server)
-    (nnheader-report 'nndraft "No such file or directory: %s"
-		     nndraft-directory))
-   ((not (file-directory-p (file-truename nndraft-directory)))
-    (nndraft-close-server)
-    (nnheader-report 'nndraft "Not a directory: %s" nndraft-directory))
-   (t
-    (nnheader-report 'nndraft "Opened server %s using directory %s"
-		     server nndraft-directory)
-    t)))
-
 (deffoo nndraft-request-article (id &optional group server buffer)
+  (nndraft-possibly-change-group group)
   (when (numberp id)
     ;; We get the newest file of the auto-saved file and the
     ;; "real" file.
@@ -118,119 +126,92 @@
 
 (deffoo nndraft-request-restore-buffer (article &optional group server)
   "Request a new buffer that is restored to the state of ARTICLE."
-  (let ((file (nndraft-article-filename article ".state"))
-	nndraft-point nndraft-mode nndraft-buffer-name)
-    (when (file-exists-p file)
-      (load file t t t)
-      (when nndraft-buffer-name
-	(set-buffer (get-buffer-create
-		     (generate-new-buffer-name nndraft-buffer-name)))
-	(nndraft-request-article article group server (current-buffer))
-	(funcall nndraft-mode)
-	(let ((gnus-verbose-backends nil))
-	  (nndraft-request-expire-articles (list article) group server t))
-	(goto-char nndraft-point))
-      nndraft-buffer-name)))
+  (nndraft-possibly-change-group group)
+  (when (nndraft-request-article article group server (current-buffer))
+    (message-remove-header "xref")
+    (message-remove-header "lines")
+    t))
 
 (deffoo nndraft-request-update-info (group info &optional server)
-  (setcar (cddr info) nil)
-  (when (nth 3 info)
-    (setcar (nthcdr 3 info) nil))
+  (nndraft-possibly-change-group group)
+  (gnus-info-set-read
+   info
+   (gnus-update-read-articles (gnus-group-prefixed-name group '(nndraft ""))
+			      (nndraft-articles) t))
+  (let (marks)
+    (when (setq marks (nth 3 info))
+      (setcar (nthcdr 3 info)
+	      (if (assq 'unsend marks)
+		  (list (assq 'unsend marks))
+		nil))))
   t)
 
 (deffoo nndraft-request-associate-buffer (group)
   "Associate the current buffer with some article in the draft group."
-  (let* ((gnus-verbose-backends nil)
-	 (article (cdr (nndraft-request-accept-article
-			group (nnoo-current-server 'nndraft) t 'noinsert)))
-	 (file (nndraft-article-filename article)))
-    (setq buffer-file-name file)
+  (nndraft-open-server "")
+  (nndraft-request-group group)
+  (nndraft-possibly-change-group group)
+  (let ((gnus-verbose-backends nil)
+	(buf (current-buffer))
+	 article file)
+    (nnheader-temp-write nil
+      (insert-buffer buf)
+      (setq article (nndraft-request-accept-article
+		     group (nnoo-current-server 'nndraft) t 'noinsert))
+      (setq file (nndraft-article-filename article)))
+    (setq buffer-file-name (expand-file-name file))
     (setq buffer-auto-save-file-name (make-auto-save-file-name))
     (clear-visited-file-modtime)
     article))
 
-(deffoo nndraft-request-group (group &optional server dont-check)
-  (prog1
-      (nndraft-execute-nnmh-command
-       `(nnmh-request-group group "" ,dont-check))
-    (nnheader-report 'nndraft nnmh-status-string)))
-
-(deffoo nndraft-request-list (&optional server dir)
-  (nndraft-execute-nnmh-command
-   `(nnmh-request-list nil ,dir)))
-
-(deffoo nndraft-request-newgroups (date &optional server)
-  (nndraft-execute-nnmh-command
-   `(nnmh-request-newgroups ,date ,server)))
-
-(deffoo nndraft-request-expire-articles
-  (articles group &optional server force)
-  (let ((res (nndraft-execute-nnmh-command
-	      `(nnmh-request-expire-articles
-		',articles group ,server ,force)))
-	article)
+(deffoo nndraft-request-expire-articles (articles group &optional server force)
+  (nndraft-possibly-change-group group)
+  (let* ((nnmh-allow-delete-final t)
+	 (res (nnoo-parent-function 'nndraft
+				    'nnmh-request-expire-articles
+				    (list articles group server force)))
+	 article)
     ;; Delete all the "state" files of articles that have been expired.
     (while articles
       (unless (memq (setq article (pop articles)) res)
-	(let ((file (nndraft-article-filename article ".state"))
-	      (auto (nndraft-auto-save-file-name
+	(let ((auto (nndraft-auto-save-file-name
 		     (nndraft-article-filename article))))
-	  (when (file-exists-p file)
-	    (funcall nnmail-delete-file-function file))
 	  (when (file-exists-p auto)
 	    (funcall nnmail-delete-file-function auto)))))
     res))
 
 (deffoo nndraft-request-accept-article (group &optional server last noinsert)
-  (let* ((point (point))
-	 (mode major-mode)
-	 (name (buffer-name))
-	 (gnus-verbose-backends nil)
-	 (gart (nndraft-execute-nnmh-command
-		`(nnmh-request-accept-article group ,server ,last noinsert)))
-	 (state
-	  (nndraft-article-filename (cdr gart) ".state")))
-    ;; Write the "state" file.
-    (save-excursion
-      (nnheader-set-temp-buffer " *draft state*")
-      (insert (format "%S\n" `(setq nndraft-mode (quote ,mode)
-				    nndraft-point ,point
-				    nndraft-buffer-name ,name)))
-      (write-region (point-min) (point-max) state nil 'silent)
-      (kill-buffer (current-buffer)))
-    gart))
-
-(deffoo nndraft-close-group (group &optional server)
-  t)
+  (nndraft-possibly-change-group group)
+  (let ((gnus-verbose-backends nil))
+    (nnoo-parent-function 'nndraft 'nnmh-request-accept-article
+			  (list group server last noinsert))))
 
 (deffoo nndraft-request-create-group (group &optional server args)
-  (if (file-exists-p nndraft-directory)
-      (if (file-directory-p nndraft-directory)
+  (nndraft-possibly-change-group group)
+  (if (file-exists-p nndraft-current-directory)
+      (if (file-directory-p nndraft-current-directory)
 	  t
 	nil)
     (condition-case ()
 	(progn
-	  (gnus-make-directory nndraft-directory)
+	  (gnus-make-directory nndraft-current-directory)
 	  t)
       (file-error nil))))
 
 
 ;;; Low-Level Interface
 
-(defun nndraft-execute-nnmh-command (command)
-  (let ((dir (expand-file-name nndraft-directory)))
-    (when (string-match "/$" dir)
-      (setq dir (substring dir 0 (match-beginning 0))))
-    (string-match "/[^/]+$" dir)
-    (let ((group (substring dir (1+ (match-beginning 0))))
-          (nnmh-directory (substring dir 0 (1+ (match-beginning 0))))
-	  (nnmail-keep-last-article nil)
-	  (nnmh-get-new-mail nil))
-      (eval command))))
+(defun nndraft-possibly-change-group (group)
+  (when (and group
+	     (not (equal group nndraft-current-group)))
+    (nndraft-open-server "")
+    (setq nndraft-current-group group)
+    (setq nndraft-current-directory
+	  (nnheader-concat nndraft-directory group))))
 
 (defun nndraft-article-filename (article &rest args)
   (apply 'concat
-	 (file-name-as-directory nndraft-directory)
+	 (file-name-as-directory nndraft-current-directory)
 	 (int-to-string article)
 	 args))
 
@@ -243,6 +224,24 @@
 	  (make-auto-save-file-name))
       (kill-buffer (current-buffer)))))
 
+(defun nndraft-articles ()
+  "Return the list of messages in the group."
+  (gnus-make-directory nndraft-current-directory)
+  (sort
+   (mapcar 'string-to-int
+	   (directory-files nndraft-current-directory nil "\\`[0-9]+\\'" t))
+   '<))
+
+(nnoo-import nndraft
+  (nnmh
+   nnmh-retrieve-headers
+   nnmh-request-group
+   nnmh-close-group
+   nnmh-request-list 
+   nnmh-request-newsgroups
+   nnmh-request-move-article
+   nnmh-request-replace-article))
+
 (provide 'nndraft)
 
 ;;; nndraft.el ends here