;;; 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.
(require 'gnus-start)
(require 'nnmh)
(require 'nnoo)
-(eval-when-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
nnmh)
-(defvoo nndraft-directory (nnheader-concat message-directory "drafts/")
+(defvoo nndraft-directory (nnheader-concat gnus-directory "drafts/")
"Where nndraft will store its files."
- nnmh-current-directory)
+ nnmh-directory)
\f
(defvoo nndraft-current-group "" nil nnmh-current-group)
-(defvoo nndraft-top-directory nil nil nnmh-directory)
(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 "" nnmh-status-string)
+(defvoo nndraft-status-string "" nil nnmh-status-string)
\f
(nnoo-define-basics nndraft)
(deffoo nndraft-open-server (server &optional defs)
- (push `(nndraft-current-group
- ,(file-name-nondirectory (directory-file-name nndraft-directory)))
- defs)
- (push `(nndraft-top-directory
- ,(file-name-directory (directory-file-name nndraft-directory)))
- defs)
(nnoo-change-server 'nndraft server defs)
(cond
((not (file-exists-p 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)
'headers))))
(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.
(deffoo nndraft-request-restore-buffer (article &optional group server)
"Request a new buffer that is restored to the state of ARTICLE."
+ (nndraft-possibly-change-group group)
(when (nndraft-request-article article group server (current-buffer))
+ (message-remove-header "xref")
+ (message-remove-header "lines")
(let ((gnus-verbose-backends nil))
(nndraft-request-expire-articles (list article) group server t))
t))
(deffoo nndraft-request-update-info (group info &optional server)
- (setcar (cddr 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)
(deffoo nndraft-request-associate-buffer (group)
"Associate the current buffer with some article in the draft group."
+ (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 (cdr (nndraft-request-accept-article
- group (nnoo-current-server 'nndraft) t 'noinsert)))
+ (setq article (nndraft-request-accept-article
+ group (nnoo-current-server 'nndraft) t 'noinsert))
(setq file (nndraft-article-filename article)))
- (setq buffer-file-name file)
+ (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-expire-articles (articles group &optional server force)
+ (nndraft-possibly-change-group group)
(let* ((nnmh-allow-delete-final t)
- (res (nndraft-execute-nnmh-command
- `(nnmh-request-expire-articles
- ',articles group ,server ,force)))
+ (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
res))
(deffoo nndraft-request-accept-article (group &optional server last noinsert)
+ (nndraft-possibly-change-group group)
(let ((gnus-verbose-backends nil))
- (nndraft-execute-nnmh-command
- `(nnmh-request-accept-article group ,server ,last noinsert))))
+ (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))))
\f
;;; Low-Level Interface
-(defun nndraft-execute-nnmh-command (command)
- (let* ((dir (directory-file-name (expand-file-name nndraft-directory)))
- (group (file-name-nondirectory dir))
- (nnmh-directory (file-name-directory dir))
- (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))
(make-auto-save-file-name))
(kill-buffer (current-buffer)))))
-(nnoo-map-functions nndraft
- (nnmh-retrieve-headers 0 nndraft-current-group 0 0)
- (nnmh-request-group nndraft-current-group 0 0)
- (nnmh-close-group nndraft-current-group 0)
- (nnmh-request-list (nnoo-current-server 'nndraft) nndraft-directory)
- (nnmh-request-newsgroups (nnoo-current-server 'nndraft) nndraft-directory))
+(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)
projects / gnus / blobdiff