1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
emacs/lisp/gnus/nndraft.el
Miles Bader 4a43ee9b90 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-345
Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 77-78)

   - Update from CVS

2005-05-31  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (article-display-x-face): Replace
   process-kill-without-query by gnus-set-process-query-on-exit-flag.

   * lisp/gnus/gnus-group.el: Bind gnus-cache-active-hashtb when compiling.

   * lisp/gnus/gnus-util.el (gnus-set-process-query-on-exit-flag): Alias to
   set-process-query-on-exit-flag or process-kill-without-query.

   * lisp/gnus/html2text.el (html2text-fix-paragraphs): Use `while - re-search'
   loop instead of replace-regexp.

   * lisp/gnus/imap.el (imap-ssl-open): Use set-process-query-on-exit-flag
   instead of process-kill-without-query if it is available.

   * lisp/gnus/mm-util.el (mm-insert-file-contents): Bind find-file-hook
   instead of find-file-hooks if it is available.

   * lisp/gnus/mml1991.el: Bind pgg-default-user-id when compiling.

   * lisp/gnus/mml2015.el: Bind pgg-default-user-id when compiling.

   * lisp/gnus/nndraft.el (nndraft-request-associate-buffer): Use
   write-contents-functions instead of write-contents-hooks if it is
   available.

   * lisp/gnus/nnheader.el (nnheader-find-file-noselect): Bind find-file-hook
   instead of find-file-hooks if it is available.

   * lisp/gnus/nntp.el (nntp-open-connection): Replace
   process-kill-without-query by gnus-set-process-query-on-exit-flag.
   (nntp-open-ssl-stream): Ditto.
   (nntp-open-tls-stream): Ditto.

   * lisp/gnus/pgg.el: Don't bind itimer vars; don't autoload itimer functions.
   (pgg-run-at-time-1): New macro.
   (pgg-run-at-time): Use it.

   * lisp/gnus/starttls.el (starttls-set-process-query-on-exit-flag): Alias to
   set-process-query-on-exit-flag or process-kill-without-query.
   (starttls-open-stream-gnutls): Use it instead of
   process-kill-without-query.
   (starttls-open-stream): Ditto.

2005-05-31  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/imap.el (imap-ssl-open): Use imap-process-connection-type,
   instead of hard coding to nil.

2005-05-31  Kevin Greiner  <kgreiner@xpediantsolutions.com>

   * lisp/gnus/gnus-group.el (): Require gnus-sum and autoload functions to
   resolve warnings when gnus-group.el compiled alone.
2005-06-01 05:07:06 +00:00

314 lines
10 KiB
EmacsLisp
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

;;; nndraft.el --- draft article access for Gnus
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; This file is part of GNU Emacs.
;; 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.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; 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.
;;; Commentary:
;;; Code:
(require 'nnheader)
(require 'nnmail)
(require 'gnus-start)
(require 'nnmh)
(require 'nnoo)
(require 'mm-util)
(eval-when-compile (require 'cl))
(nnoo-declare nndraft
nnmh)
(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 "" 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)))
(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* (article)
;; We don't support fetching by Message-ID.
(if (stringp (car articles))
'headers
(while articles
(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))
(goto-char (point-min))
(insert (format "221 %d Article retrieved.\n" article))
(widen)
(goto-char (point-max))
(insert ".\n")))
(nnheader-fold-continuation-lines)
'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.
(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)
(let ((nnmail-file-coding-system
(if (file-newer-than-file-p file auto)
(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)
(goto-char (point-min))
;; If there's a mail header separator in this file,
;; we remove it.
(when (re-search-forward
(concat "^" (regexp-quote mail-header-separator) "$") nil t)
(replace-match "" t t)))
t))))
(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")
;; 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)
(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 "")
(nndraft-request-group group)
(nndraft-possibly-change-group group)
(let ((gnus-verbose-backends nil)
(buf (current-buffer))
article file)
(with-temp-buffer
(insert-buffer-substring buf)
(setq article (nndraft-request-accept-article
group (nnoo-current-server 'nndraft) t 'noinsert)
file (nndraft-article-filename article)))
(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))
article))
(deffoo nndraft-request-group (group &optional server dont-check)
(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-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)))
(rename-file (nndraft-auto-save-file-name file) file)))))
(nnoo-parent-function 'nndraft
'nnmh-request-group
(list group server dont-check)))
(deffoo nndraft-request-move-article (article group server
accept-form &optional last)
(nndraft-possibly-change-group group)
(let ((buf (get-buffer-create " *nndraft move*"))
result)
(and
(nndraft-request-article article group server)
(save-excursion
(set-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)
(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 ((auto (nndraft-auto-save-file-name
(nndraft-article-filename article))))
(when (file-exists-p auto)
(funcall nnmail-delete-file-function auto)))
(dolist (backup
(let ((kept-new-versions 1)
(kept-old-versions 0))
(find-backup-file-name
(nndraft-article-filename article))))
(when (file-exists-p backup)
(funcall nnmail-delete-file-function backup)))))
res))
(deffoo nndraft-request-accept-article (group &optional server last noinsert)
(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-replace-article (article group buffer)
(nndraft-possibly-change-group group)
(let ((nnmail-file-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))))
(deffoo nndraft-request-create-group (group &optional server args)
(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-current-directory)
t)
(file-error nil))))
;;; Low-Level Interface
(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-current-directory)
(int-to-string article)
args))
(defun nndraft-auto-save-file-name (file)
(save-excursion
(prog1
(progn
(set-buffer (get-buffer-create " *draft tmp*"))
(setq buffer-file-name file)
(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-number
(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))
(provide 'nndraft)
;;; arch-tag: 3ce26ca0-41cb-48b1-8703-4dad35e188aa
;;; nndraft.el ends here