T-gnus 6.15.24 revision 00.

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

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 9d7eeec..d4e1483 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -1,6 +1,6 @@
 ;;; nnmh.el --- mhspool access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -44,16 +44,16 @@
 (nnoo-declare nnmh)
 
 (defvoo nnmh-directory message-directory
-  "*Mail spool directory.")
+  "Mail spool directory.")
 
 (defvoo nnmh-get-new-mail t
-  "*If non-nil, nnmh will check the incoming mail file and split the mail.")
+  "If non-nil, nnmh will check the incoming mail file and split the mail.")
 
 (defvoo nnmh-prepare-save-mail-hook nil
-  "*Hook run narrowed to an article before saving.")
+  "Hook run narrowed to an article before saving.")
 
 (defvoo nnmh-be-safe nil
-  "*If non-nil, nnmh will check all articles to make sure whether they are new or not.
+  "If non-nil, nnmh will check all articles to make sure whether they are new or not.
 Go through the .nnmh-articles file and compare with the actual
 articles in this folder.  The articles that are \"new\" will be marked
 as unread by Gnus.")
@@ -122,7 +122,7 @@ as unread by Gnus.")
        (when large
          (nnheader-message 5 "nnmh: Receiving headers...done"))
 
-        ;; (nnheader-fold-continuation-lines)
+       ;; (nnheader-fold-continuation-lines)
        'headers))))
 
 (deffoo nnmh-open-server (server &optional defs)
@@ -239,17 +239,19 @@ as unread by Gnus.")
          (goto-char (point-max))
          (insert
           (format
-           "%s %d %d y\n"
+           "%s %.0f %.0f y\n"
            (progn
              (string-match
               (regexp-quote
                (file-truename (file-name-as-directory
                                (expand-file-name nnmh-toplev))))
               dir)
-             (nnheader-replace-chars-in-string
-              (decode-coding-string (substring dir (match-end 0))
-                                    nnmail-pathname-coding-system)
-              ?/ ?.))
+             (string-as-multibyte
+              (encode-coding-string
+               (nnheader-replace-chars-in-string
+                (substring dir (match-end 0))
+                ?/ ?.)
+               nnmail-pathname-coding-system)))
            (apply 'max files)
            (apply 'min files)))))))
   t)
@@ -295,8 +297,8 @@ as unread by Gnus.")
 (deffoo nnmh-close-group (group &optional server)
   t)
 
-(deffoo nnmh-request-move-article
-    (article group server accept-form &optional last)
+(deffoo nnmh-request-move-article (article group server
+                                          accept-form &optional last)
   (let ((buf (get-buffer-create " *nnmh move*"))
        result)
     (and
@@ -323,7 +325,7 @@ 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")))
+    (nnmail-cache-insert (nnmail-fetch-field "message-id") group))
   (nnheader-init-server-buffer)
   (prog1
       (if (stringp group)
@@ -432,7 +434,7 @@ as unread by Gnus.")
          (pathname-coding-system nnmail-pathname-coding-system))
       (if (file-directory-p pathname)
          (setq nnmh-current-directory pathname)
-       (error "No such newsgroup: %s" newsgroup)))))
+       (nnheader-report 'nnmh "Not a directory: %s" nnmh-directory)))))
 
 (defun nnmh-possibly-create-directory (group)
   (let (dir dirs)