[Emacs-diffs] Changes to emacs/lisp/gnus/nndraft.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/gnus/nndraft.el
diff -c emacs/lisp/gnus/nndraft.el:1.3.24.1 emacs/lisp/gnus/nndraft.el:1.3.24.2
*** emacs/lisp/gnus/nndraft.el:1.3.24.1 Fri Mar 12 00:03:11 2004
--- emacs/lisp/gnus/nndraft.el  Thu Sep  9 09:36:26 2004
***************
*** 1,5 ****
  ;;; nndraft.el --- draft article access for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
--- 1,6 ----
  ;;; nndraft.el --- draft article access for Gnus
! 
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
***************
*** 32,41 ****
  (require 'nnmh)
  (require 'nnoo)
  (require 'mm-util)
! (eval-when-compile
!   (require 'cl)
!   ;; This is just to shut up the byte-compiler.
!   (fset 'nndraft-request-group 'ignore))
  
  (nnoo-declare nndraft
    nnmh)
--- 33,39 ----
  (require 'nnmh)
  (require 'nnoo)
  (require 'mm-util)
! (eval-when-compile (require 'cl))
  
  (nnoo-declare nndraft
    nnmh)
***************
*** 113,119 ****
        (when (and (file-exists-p newest)
                 (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)))
--- 111,117 ----
        (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)))
***************
*** 124,130 ****
          ;; 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))))
  
--- 122,128 ----
          ;; 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))))
  
***************
*** 134,139 ****
--- 132,140 ----
    (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)
***************
*** 151,156 ****
--- 152,163 ----
                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 "")
***************
*** 167,174 ****
--- 174,218 ----
      (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)
+   (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)))
+                       (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)
***************
*** 201,208 ****
  (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
           mm-text-coding-system)))
      (nnoo-parent-function 'nndraft 'nnmh-request-replace-article
                          (list article group buffer))))
--- 245,252 ----
  (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))))
***************
*** 259,266 ****
     nnmh-request-group
     nnmh-close-group
     nnmh-request-list
!    nnmh-request-newsgroups
!    nnmh-request-move-article))
  
  (provide 'nndraft)
  
--- 303,309 ----
     nnmh-request-group
     nnmh-close-group
     nnmh-request-list
!    nnmh-request-newsgroups))
  
  (provide 'nndraft)