Fix typo in nnmh.el and Insert different Message-ID in each message/partail message

[elisp/gnus.git-] / lisp / nnmh.el

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index c359e95..6f4480d 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -229,8 +229,8 @@
                                (expand-file-name nnmh-toplev))))
               dir)
              (nnheader-replace-chars-in-string
-              (gnus-decode-coding-string (substring dir (match-end 0))
-                                         nnmail-pathname-coding-system)
+              (decode-coding-string (substring dir (match-end 0))
+                                    nnmail-pathname-coding-system)
               ?/ ?.))
            (apply 'max files)
            (apply 'min files)))))))
@@ -242,13 +242,7 @@
 (deffoo nnmh-request-expire-articles (articles newsgroup
                                               &optional server force)
   (nnmh-possibly-change-directory newsgroup server)
-  (let* ((active-articles
-         (mapcar
-          (function
-           (lambda (name)
-             (string-to-int name)))
-          (directory-files nnmh-current-directory nil "^[0-9]+$" t)))
-        (is-old t)
+  (let* ((is-old t)
         article rest mod-time)
     (nnheader-init-server-buffer)
 
@@ -300,7 +294,9 @@
 
 (deffoo nnmh-request-accept-article (group &optional server last noinsert)
   (nnmh-possibly-change-directory group server)
-  (nnmail-check-syntax)
+  (if (and (not (equal group "queue"))
+          (not (equal grouo "draft")))
+      (nnmail-check-syntax))
   (when nnmail-cache-accepted-message-ids
     (nnmail-cache-insert (nnmail-fetch-field "message-id")))
   (nnheader-init-server-buffer)
@@ -539,7 +535,7 @@
     (setq articles (sort articles (lambda (art1 art2)
                                    (> (car art1) (car art2)))))
     ;; Finally write this list back to the .nnmh-articles file.
-    (nnheader-temp-write nnmh-file
+    (with-temp-file nnmh-file
       (insert ";; Gnus article active file for " group "\n\n")
       (insert "(setq nnmh-newsgroup-articles '")
       (gnus-prin1 articles)