X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnndraft.el;h=5f57dd2bf7c3f7412cac70927acc5cd0bfc45658;hp=379c0ab40dcc32e1eac2efa1d0e037c1dd8ad40b;hb=b52037f4a9c6bee1ff556c22750e158da1208d4b;hpb=57be6d505247d69a296115c7f8213bc93d2dcfda diff --git a/lisp/nndraft.el b/lisp/nndraft.el index 379c0ab40..5f57dd2bf 100644 --- a/lisp/nndraft.el +++ b/lisp/nndraft.el @@ -1,16 +1,16 @@ ;;; nndraft.el --- draft article access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1995-2016 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,9 +18,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -29,11 +27,15 @@ (require 'nnheader) (require 'nnmail) (require 'gnus-start) +(require 'gnus-group) (require 'nnmh) (require 'nnoo) (require 'mm-util) (eval-when-compile (require 'cl)) +;; The nnoo-import at the end, I think. +(declare-function nndraft-request-list "nndraft" (&rest args) t) + (nnoo-declare nndraft nnmh) @@ -41,6 +43,11 @@ "Where nndraft will store its files." nnmh-directory) +(defvar nndraft-required-headers '(Date) + "*Headers to be generated when saving a draft message. +The headers in this variable and the ones in `message-required-headers' +are generated if and only if they are also in `message-draft-headers'.") + (defvoo nndraft-current-group "" nil nnmh-current-group) @@ -73,10 +80,9 @@ (deffoo nndraft-retrieve-headers (articles &optional group server fetch-old) (nndraft-possibly-change-group group) - (save-excursion - (set-buffer nntp-server-buffer) + (with-current-buffer nntp-server-buffer (erase-buffer) - (let* (article) + (let (article lines chars) ;; We don't support fetching by Message-ID. (if (stringp (car articles)) 'headers @@ -88,9 +94,12 @@ (if (search-forward "\n\n" nil t) (forward-line -1) (goto-char (point-max))) + (setq lines (count-lines (point) (point-max)) + chars (- (point-max) (point))) (delete-region (point) (point-max)) (goto-char (point-min)) (insert (format "221 %d Article retrieved.\n" article)) + (insert (format "Lines: %d\nChars: %d\n" lines chars)) (widen) (goto-char (point-max)) (insert ".\n"))) @@ -110,18 +119,17 @@ (when (and (file-exists-p newest) (let ((nnmail-file-coding-system (if (file-newer-than-file-p file auto) - (if (equal group "drafts") + (if (member group '("drafts" "delayed")) message-draft-coding-system mm-text-coding-system) mm-auto-save-coding-system))) (nnmail-find-file newest))) - (save-excursion - (set-buffer nntp-server-buffer) + (with-current-buffer nntp-server-buffer (goto-char (point-min)) ;; 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)))) @@ -151,6 +159,34 @@ nil)))) t) +(defun nndraft-generate-headers () + (save-excursion + (message-generate-headers + (message-headers-to-generate + nndraft-required-headers message-draft-headers nil)))) + +(defun nndraft-update-unread-articles () + "Update groups' unread articles in the group buffer." + (nndraft-request-list) + (with-current-buffer gnus-group-buffer + (let* ((groups (mapcar (lambda (elem) + (gnus-group-prefixed-name (car elem) + (list 'nndraft ""))) + (nnmail-get-active))) + (gnus-group-marked (copy-sequence groups)) + ;; Don't send delayed articles. + (gnus-get-new-news-hook nil) + (inhibit-read-only t)) + (gnus-group-get-new-news-this-group nil t) + (save-excursion + (dolist (group groups) + (unless (and gnus-permanently-visible-groups + (string-match gnus-permanently-visible-groups + group)) + (gnus-group-goto-group group) + (when (zerop (gnus-group-group-unread)) + (gnus-delete-line)))))))) + (deffoo nndraft-request-associate-buffer (group) "Associate the current buffer with some article in the draft group." (nndraft-open-server "") @@ -167,17 +203,27 @@ (setq buffer-file-name (expand-file-name file) buffer-auto-save-file-name (make-auto-save-file-name)) (clear-visited-file-modtime) + (let ((hook (if (boundp 'write-contents-functions) + 'write-contents-functions + 'write-contents-hooks))) + (gnus-make-local-hook hook) + (add-hook hook 'nndraft-generate-headers nil t)) + (gnus-make-local-hook 'after-save-hook) + (add-hook 'after-save-hook 'nndraft-update-unread-articles nil t) + (message-add-action '(nndraft-update-unread-articles) + 'exit 'postpone 'kill) article)) -(deffoo nndraft-request-group (group &optional server dont-check) +(deffoo nndraft-request-group (group &optional server dont-check info) (nndraft-possibly-change-group group) (unless dont-check (let* ((pathname (nnmail-group-pathname group nndraft-directory)) (file-name-coding-system nnmail-pathname-coding-system) 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))) + (setq dir (mapcar (lambda (name) (string-to-number (substring name 1))) + (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))) @@ -186,9 +232,35 @@ 'nnmh-request-group (list group server dont-check))) +(deffoo nndraft-request-move-article (article group server accept-form + &optional last move-is-internal) + (nndraft-possibly-change-group group) + (let ((buf (get-buffer-create " *nndraft move*")) + result) + (and + (nndraft-request-article article group server) + (with-current-buffer buf + (erase-buffer) + (insert-buffer-substring nntp-server-buffer) + (setq result (eval accept-form)) + (kill-buffer (current-buffer)) + result) + (null (nndraft-request-expire-articles (list article) group server 'force)) + result))) + (deffoo nndraft-request-expire-articles (articles group &optional server force) (nndraft-possibly-change-group group) (let* ((nnmh-allow-delete-final t) + (nnmail-expiry-target 'delete) + ;; FIXME: If we want to move a draft message to an expiry group, + ;; there are things to have to improve: + ;; - Remove a header separator. + ;; - Encode it, including attachments, into a MIME message. + ;;(nnmail-expiry-target + ;; (or (gnus-group-find-parameter + ;; (gnus-group-prefixed-name group (list 'nndraft server)) + ;; 'expiry-target t) + ;; nnmail-expiry-target)) (res (nnoo-parent-function 'nndraft 'nnmh-request-expire-articles (list articles group server force))) @@ -218,8 +290,8 @@ (deffoo nndraft-request-replace-article (article group buffer) (nndraft-possibly-change-group group) (let ((nnmail-file-coding-system - (if (equal group "drafts") - mm-auto-save-coding-system + (if (member group '("drafts" "delayed")) + message-draft-coding-system mm-text-coding-system))) (nnoo-parent-function 'nndraft 'nnmh-request-replace-article (list article group buffer)))) @@ -266,7 +338,7 @@ "Return the list of messages in the group." (gnus-make-directory nndraft-current-directory) (sort - (mapcar 'string-to-int + (mapcar 'string-to-number (directory-files nndraft-current-directory nil "\\`[0-9]+\\'" t)) '<)) @@ -275,9 +347,7 @@ nnmh-retrieve-headers nnmh-request-group nnmh-close-group - nnmh-request-list - nnmh-request-newsgroups - nnmh-request-move-article)) + nnmh-request-list)) (provide 'nndraft)