projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synch with Oort Gnus.
[elisp/gnus.git-]
/
lisp
/
nndraft.el
diff --git
a/lisp/nndraft.el
b/lisp/nndraft.el
index
1214406
..
57397fb
100644
(file)
--- a/
lisp/nndraft.el
+++ b/
lisp/nndraft.el
@@
-1,5
+1,6
@@
;;; nndraft.el --- draft article access for Gnus
;;; nndraft.el --- draft article access for Gnus
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@
-26,14
+27,13
@@
;;; Code:
;;; Code:
+(eval-when-compile (require 'cl))
+
(require 'nnheader)
(require 'nnmail)
(require 'gnus-start)
(require 'nnmh)
(require 'nnoo)
(require 'nnheader)
(require 'nnmail)
(require 'gnus-start)
(require 'nnmh)
(require 'nnoo)
-(require 'mm-util)
-(eval-when-compile
- (require 'cl))
(nnoo-declare nndraft
nnmh)
(nnoo-declare nndraft
nnmh)
@@
-113,8
+113,8
@@
(if (file-newer-than-file-p file auto)
(if (equal group "drafts")
message-draft-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)))
+ nnheader-text-coding-system)
+ nnheader-auto-save-coding-system)))
(nnmail-find-file newest)))
(save-excursion
(set-buffer nntp-server-buffer)
(nnmail-find-file newest)))
(save-excursion
(set-buffer nntp-server-buffer)
@@
-132,7
+132,9
@@
(when (nndraft-request-article article group server (current-buffer))
(message-remove-header "xref")
(message-remove-header "lines")
(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)
t))
(deffoo nndraft-request-update-info (group info &optional server)
@@
-180,8
+182,7
@@
(dolist (n dir)
(unless (file-exists-p
(setq file (expand-file-name (int-to-string n) pathname)))
(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)))
(nnoo-parent-function 'nndraft
'nnmh-request-group
(list group server dont-check)))
@@
-217,10
+218,7
@@
(deffoo nndraft-request-replace-article (article group buffer)
(nndraft-possibly-change-group group)
(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)))
+ (let ((nnmail-file-coding-system nnheader-text-coding-system))
(nnoo-parent-function 'nndraft 'nnmh-request-replace-article
(list article group buffer))))
(nnoo-parent-function 'nndraft 'nnmh-request-replace-article
(list article group buffer))))