X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnndraft.el;h=487ffc17253d6e622f432bf47cebb2f497e6427c;hb=d86ab5078b7ef13ba72403bbbe216e0ac48a9d2f;hp=5ec06e605a861fe5b5615bbcd3b001c1f9d91884;hpb=73edf76920c3d86afa1628ca8f1509394cb7b26c;p=elisp%2Fgnus.git-

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index 5ec06e6..487ffc1 100644
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -25,14 +25,14 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'nnheader)
 (require 'nnmail)
 (require 'gnus-start)
 (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))
 
@@ -110,13 +110,7 @@
 	   (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 (equal group "drafts")
-				message-draft-coding-system
-			      mm-text-coding-system)
-			  mm-auto-save-coding-system)))
-		   (nnmail-find-file newest)))
+		 (nnmail-find-file newest))
 	(save-excursion
 	  (set-buffer nntp-server-buffer)
 	  (goto-char (point-min))
@@ -141,8 +135,9 @@
    info
    (gnus-update-read-articles (gnus-group-prefixed-name group '(nndraft ""))
 			      (nndraft-articles) t))
-  (let (marks)
-    (when (setq marks (nth 3 info))
+  (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))
@@ -156,7 +151,7 @@
   (nndraft-possibly-change-group group)
   (let ((gnus-verbose-backends nil)
 	(buf (current-buffer))
-	 article file)
+	article file)
     (with-temp-buffer
       (insert-buffer-substring buf)
       (setq article (nndraft-request-accept-article