;;; nndraft.el --- draft article access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
(newest (if (file-newer-than-file-p file auto) file auto))
(nntp-server-buffer (or buffer nntp-server-buffer)))
(when (and (file-exists-p newest)
- (let ((nnmail-file-coding-system nnheader-text-coding-system))
+ (let ((nnmail-file-coding-system
+ (if (file-newer-than-file-p file auto)
+ (if (member group '("drafts" "delayed"))
+ message-draft-coding-system
+ nnheader-text-coding-system)
+ nnheader-auto-save-coding-system)))
(nnmail-find-file newest)))
(save-excursion
(set-buffer nntp-server-buffer)
;; If there's a mail header separator in this file,
;; we remove it.
(when (re-search-forward
- (concat "^" mail-header-separator "$") nil t)
+ (concat "^" (regexp-quote mail-header-separator) "$") nil t)
(replace-match "" t t)))
t))))
(when (nndraft-request-article article group server (current-buffer))
(message-remove-header "xref")
(message-remove-header "lines")
- (message-remove-header "date")
+ ;; Articles in nndraft:queue are considered as sent messages. The
+ ;; Date field should be the time when they are sent.
+ ;;(message-remove-header "date")
t))
(deffoo nndraft-request-update-info (group info &optional server)
nil))))
t)
+(defun nndraft-generate-headers ()
+ (save-excursion
+ (message-generate-headers
+ (message-headers-to-generate
+ message-required-headers message-draft-headers nil))))
+
(deffoo nndraft-request-associate-buffer (group)
"Associate the current buffer with some article in the draft group."
(nndraft-open-server "")
(setq buffer-file-name (expand-file-name file)
buffer-auto-save-file-name (make-auto-save-file-name))
(clear-visited-file-modtime)
+ (make-local-variable 'write-contents-hooks)
+ (push 'nndraft-generate-headers write-contents-hooks)
article))
(deffoo nndraft-request-group (group &optional server dont-check)
dir file)
(nnheader-re-read-dir pathname)
(setq dir (mapcar (lambda (name) (string-to-int (substring name 1)))
- (directory-files pathname nil "^#[0-9]+#$" t)))
+ (ignore-errors (directory-files
+ pathname nil "^#[0-9]+#$" t))))
(dolist (n dir)
(unless (file-exists-p
(setq file (expand-file-name (int-to-string n) pathname)))
- (rename-file (let ((buffer-file-name file))
- (make-auto-save-file-name)) file)))))
+ (rename-file (nndraft-auto-save-file-name file) file)))))
(nnoo-parent-function 'nndraft
'nnmh-request-group
(list group server dont-check)))
(deffoo nndraft-request-replace-article (article group buffer)
(nndraft-possibly-change-group group)
- (let ((nnmail-file-coding-system nnheader-text-coding-system))
+ (let ((nnmail-file-coding-system
+ (if (member group '("drafts" "delayed"))
+ message-draft-coding-system
+ nnheader-text-coding-system)))
(nnoo-parent-function 'nndraft 'nnmh-request-replace-article
(list article group buffer))))