X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnndraft.el;h=789d8e79c3e1b8d313f35a9a472fa42b54dd9d0d;hb=0d34ee305d12def612850d1f62d0fa066bb7da01;hp=e289cc6bfd358a92fa19ed4d05f66ebe04f2660b;hpb=bc2e36aa3571e009279f3cb47dc28ada8ccf3c37;p=gnus diff --git a/lisp/nndraft.el b/lisp/nndraft.el index e289cc6bf..789d8e79c 100644 --- a/lisp/nndraft.el +++ b/lisp/nndraft.el @@ -1,7 +1,8 @@ ;;; nndraft.el --- draft article access for Gnus -;; Copyright (C) 1995,96 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 +;; Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Author: Lars Magne Ingebrigtsen ;; Keywords: news ;; This file is part of GNU Emacs. @@ -26,227 +27,230 @@ ;;; Code: (require 'nnheader) +(require 'nnmail) +(require 'gnus-start) (require 'nnmh) -(eval-and-compile (require 'cl)) +(require 'nnoo) +(require 'mm-util) +(eval-when-compile (require 'cl)) -(eval-and-compile - (autoload 'mail-send-and-exit "sendmail")) +(nnoo-declare nndraft + nnmh) -(defvar 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) -(defconst nndraft-version "nndraft 1.0") -(defvar nndraft-status-string "") - - +(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) -(defvar nndraft-current-server nil) -(defvar nndraft-server-alist nil) -(defvar nndraft-server-variables - `((nndraft-directory nil) - (nndraft-status-string "") - (nndraft-group-alist))) +(defconst nndraft-version "nndraft 1.0") +(defvoo nndraft-status-string "" nil nnmh-status-string) ;;; Interface functions. +(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))) -(defun nndraft-retrieve-headers (articles &optional group server fetch-old) +(deffoo nndraft-retrieve-headers (articles &optional group server fetch-old) + (nndraft-possibly-change-group group) (save-excursion (set-buffer nntp-server-buffer) (erase-buffer) - (let* ((file nil) - (buf (get-buffer-create " *draft headers*")) - beg article) - (set-buffer buf) - (buffer-disable-undo (current-buffer)) - (erase-buffer) + (let* (article) ;; We don't support fetching by Message-ID. (if (stringp (car articles)) 'headers (while articles - (set-buffer buf) - (when (nndraft-request-article + (narrow-to-region (point) (point)) + (when (nndraft-request-article (setq article (pop articles)) group server (current-buffer)) (goto-char (point-min)) (if (search-forward "\n\n" nil t) (forward-line -1) (goto-char (point-max))) (delete-region (point) (point-max)) - (set-buffer nntp-server-buffer) - (goto-char (point-max)) + (goto-char (point-min)) (insert (format "221 %d Article retrieved.\n" article)) - (insert-buffer-substring buf) + (widen) + (goto-char (point-max)) (insert ".\n"))) (nnheader-fold-continuation-lines) 'headers)))) -(defun nndraft-open-server (server &optional defs) - (nnheader-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))) - -(defun nndraft-close-server (&optional server) - (setq nndraft-current-server nil) - t) - -(defun nndraft-server-opened (&optional server) - (and nntp-server-buffer - (get-buffer nntp-server-buffer) - nndraft-current-server - (equal nndraft-current-server server))) - -(defun nndraft-status-message (&optional server) - nndraft-status-string) - -(defun nndraft-request-article (id &optional group server buffer) +(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 + ;; We get the newest file of the auto-saved file and the ;; "real" file. (let* ((file (nndraft-article-filename id)) (auto (nndraft-auto-save-file-name file)) (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) - (nnmail-find-file newest)) - (save-excursion + (let ((nnmail-file-coding-system + (if (file-newer-than-file-p file auto) + (if (equal group "drafts") + message-draft-coding-system + mm-text-coding-system) + mm-auto-save-coding-system))) + (nnmail-find-file newest))) + (save-excursion (set-buffer nntp-server-buffer) (goto-char (point-min)) - ;; If there's a mail header separator in this file, + ;; If there's a mail header separator in this file, ;; we remove it. (when (re-search-forward (concat "^" mail-header-separator "$") nil t) (replace-match "" t t))) t)))) -(defun nndraft-request-restore-buffer (article &optional group server) +(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))) - -(defun nndraft-request-update-info (group info &optional server) - (setcar (cdr (cdr info)) nil) - (when (nth 3 info) - (setcar (nthcdr 3 info) nil))) - -(defun nndraft-request-associate-buffer (group) + (nndraft-possibly-change-group group) + (when (nndraft-request-article article group server (current-buffer)) + (message-remove-header "xref") + (message-remove-header "lines") + ;; 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) + (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 (nth 3 info))) + (when marks + ;; Nix out all marks except the `unsend'-able article marks. + (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 (c