Importing Pterodactyl Gnus v0.96.

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

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 0001703..cfe41ab 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -1,7 +1,7 @@
 ;;; nnmh.el --- mhspool access for Gnus
-;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: news, mail
 
@@ -104,11 +104,11 @@
 
          (and large
               (zerop (% count 20))
-              (message "nnmh: Receiving headers... %d%%"
+              (nnheader-message 5 "nnmh: Receiving headers... %d%%"
                        (/ (* count 100) number))))
 
        (when large
-         (message "nnmh: Receiving headers...done"))
+         (nnheader-message 5 "nnmh: Receiving headers...done"))
 
        (nnheader-fold-continuation-lines)
        'headers))))
@@ -173,11 +173,14 @@
               '<))
          (cond
           (dir
+           (setq nnmh-group-alist
+                 (delq (assoc group nnmh-group-alist) nnmh-group-alist))
+           (push (list group (cons (car dir) (car (last dir))))
+                 nnmh-group-alist)
            (nnheader-report 'nnmh "Selected group %s" group)
            (nnheader-insert
             "211 %d %d %d %s\n" (length dir) (car dir)
-            (progn (while (cdr dir) (setq dir (cdr dir))) (car dir))
-            group))
+            (car (last dir)) group))
           (t
            (nnheader-report 'nnmh "Empty group %s" group)
            (nnheader-insert (format "211 0 1 0 %s\n" group))))))))))
@@ -229,8 +232,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)
+              (mm-decode-coding-string (substring dir (match-end 0))
+                                       nnmail-pathname-coding-system)
               ?/ ?.))
            (apply 'max files)
            (apply 'min files)))))))
@@ -242,13 +245,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)
 
@@ -270,7 +267,7 @@
                 (push (car articles) rest))))
          (push (car articles) rest)))
       (setq articles (cdr articles)))
-    (message "")
+    (nnheader-message 5 "")
     (nconc rest articles)))
 
 (deffoo nnmh-close-group (group &optional server)
@@ -429,8 +426,8 @@
   (unless noinsert
     (nnmail-insert-lines)
     (nnmail-insert-xref group-art))
-  (gnus-run-hooks 'nnmail-prepare-save-mail-hook)
-  (gnus-run-hooks 'nnmh-prepare-save-mail-hook)
+  (run-hooks 'nnmail-prepare-save-mail-hook)
+  (run-hooks 'nnmh-prepare-save-mail-hook)
   (goto-char (point-min))
   (while (looking-at "From ")
     (replace-match "X-From-Line: ")
@@ -539,7 +536,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)