Synch to No Gnus 200403032358.

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

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index d4e1483..ba31475 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -34,7 +34,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'gnus-clfns))
 
 (require 'nnheader)
 (require 'nnmail)
@@ -89,7 +88,6 @@ as unread by Gnus.")
                       (> number nnmail-large-newsgroup)))
           (count 0)
           (file-name-coding-system nnmail-pathname-coding-system)
-          (pathname-coding-system nnmail-pathname-coding-system)
           beg article)
       (nnmh-possibly-change-directory newsgroup server)
       ;; We don't support fetching by Message-ID.
@@ -149,7 +147,6 @@ as unread by Gnus.")
                  nil
                (concat nnmh-current-directory (int-to-string id))))
        (file-name-coding-system nnmail-pathname-coding-system)
-       (pathname-coding-system nnmail-pathname-coding-system)
        (nntp-server-buffer (or buffer nntp-server-buffer)))
     (and (stringp file)
         (file-exists-p file)
@@ -162,7 +159,6 @@ as unread by Gnus.")
   (nnmh-possibly-change-directory group server)
   (let ((pathname (nnmail-group-pathname group nnmh-directory))
        (file-name-coding-system nnmail-pathname-coding-system)
-       (pathname-coding-system nnmail-pathname-coding-system)
        dir)
     (cond
      ((not (file-directory-p pathname))
@@ -206,7 +202,6 @@ as unread by Gnus.")
   (nnheader-insert "")
   (nnmh-possibly-change-directory nil server)
   (let ((file-name-coding-system nnmail-pathname-coding-system)
-       (pathname-coding-system nnmail-pathname-coding-system)
        (nnmh-toplev
         (file-truename (or dir (file-name-as-directory nnmh-directory)))))
     (nnmh-request-list-1 nnmh-toplev))
@@ -325,7 +320,10 @@ as unread by Gnus.")
           (not (equal group "draft")))
       (nnmail-check-syntax))
   (when nnmail-cache-accepted-message-ids
-    (nnmail-cache-insert (nnmail-fetch-field "message-id") group))
+    (nnmail-cache-insert (nnmail-fetch-field "message-id") 
+                        group
+                        (nnmail-fetch-field "subject")
+                        (nnmail-fetch-field "from")))
   (nnheader-init-server-buffer)
   (prog1
       (if (stringp group)
@@ -430,8 +428,7 @@ as unread by Gnus.")
     (nnmh-open-server server))
   (when newsgroup
     (let ((pathname (nnmail-group-pathname newsgroup nnmh-directory))
-         (file-name-coding-system nnmail-pathname-coding-system)
-         (pathname-coding-system nnmail-pathname-coding-system))
+         (file-name-coding-system nnmail-pathname-coding-system))
       (if (file-directory-p pathname)
          (setq nnmh-current-directory pathname)
        (nnheader-report 'nnmh "Not a directory: %s" nnmh-directory)))))
@@ -481,7 +478,6 @@ as unread by Gnus.")
   (let ((active (cadr (assoc group nnmh-group-alist)))
        (dir (nnmail-group-pathname group nnmh-directory))
        (file-name-coding-system nnmail-pathname-coding-system)
-       (pathname-coding-system nnmail-pathname-coding-system)
        file)
     (unless active
       ;; The group wasn't known to nnmh, so we just create an active