(mm-codepage-setup): New helper function.

[gnus] / lisp / nnmh.el

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 0ab8767..04ac1a6 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -1,7 +1,7 @@
 ;;; nnmh.el --- mhspool access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
-;;     Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;;   2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -150,7 +150,7 @@ as unread by Gnus.")
         (file-exists-p file)
         (not (file-directory-p file))
         (save-excursion (nnmail-find-file file))
-        (string-to-int (file-name-nondirectory file)))))
+        (string-to-number (file-name-nondirectory file)))))
 
 (deffoo nnmh-request-group (group &optional server dont-check)
   (nnheader-init-server-buffer)
@@ -176,7 +176,7 @@ as unread by Gnus.")
        (nnheader-re-read-dir pathname)
        (setq dir
              (sort
-              (mapcar (lambda (name) (string-to-int name))
+              (mapcar 'string-to-number
                       (directory-files pathname nil "^[0-9]+$" t))
               '<))
        (cond
@@ -211,7 +211,6 @@ as unread by Gnus.")
   (setq dir (expand-file-name dir))
   ;; Recurse down all directories.
   (let ((dirs (and (file-readable-p dir)
-                  (> (nth 1 (file-attributes (file-chase-links dir))) 2)
                   (nnheader-directory-files dir t nil t)))
        rdir)
     ;; Recurse down directories.
@@ -223,16 +222,15 @@ as unread by Gnus.")
        (nnmh-request-list-1 rdir))))
   ;; For each directory, generate an active file line.
   (unless (string= (expand-file-name nnmh-toplev) dir)
-    (let ((files (mapcar
-                 (lambda (name) (string-to-int name))
-                 (directory-files dir nil "^[0-9]+$" t))))
+    (let ((files (mapcar 'string-to-number
+                        (directory-files dir nil "^[0-9]+$" t))))
       (when files
        (save-excursion
          (set-buffer nntp-server-buffer)
          (goto-char (point-max))
          (insert
           (format
-           "%s %d %d y\n"
+           "%s %.0f %.0f y\n"
            (progn
              (string-match
               (regexp-quote
@@ -290,8 +288,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 move-is-internal)
   (let ((buf (get-buffer-create " *nnmh move*"))
        result)
     (and
@@ -316,7 +314,10 @@ as unread by Gnus.")
   (nnmh-possibly-change-directory group server)
   (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
+                        (nnmail-fetch-field "subject")
+                        (nnmail-fetch-field "from")))
   (nnheader-init-server-buffer)
   (prog1
       (if (stringp group)
@@ -353,11 +354,9 @@ as unread by Gnus.")
            nnmh-group-alist)
       (nnmh-possibly-create-directory group)
       (nnmh-possibly-change-directory group server)
-      (let ((articles (mapcar
-                      (lambda (file)
-                        (string-to-int file))
-                      (directory-files
-                       nnmh-current-directory nil "^[0-9]+$"))))
+      (let ((articles (mapcar 'string-to-number
+                             (directory-files
+                              nnmh-current-directory nil "^[0-9]+$"))))
        (when articles
          (setcar active (apply 'min articles))
          (setcdr active (apply 'max articles))))))
@@ -481,10 +480,8 @@ as unread by Gnus.")
        (gnus-make-directory dir))
       ;; Find the highest number in the group.
       (let ((files (sort
-                   (mapcar
-                    (lambda (f)
-                      (string-to-int f))
-                    (directory-files dir nil "^[0-9]+$"))
+                   (mapcar 'string-to-number
+                           (directory-files dir nil "^[0-9]+$"))
                    '>)))
        (when files
          (setcdr active (car files)))))
@@ -506,7 +503,7 @@ as unread by Gnus.")
   ;; articles in this folder.  The articles that are "new" will be
   ;; marked as unread by Gnus.
   (let* ((dir nnmh-current-directory)
-        (files (sort (mapcar (function (lambda (name) (string-to-int name)))
+        (files (sort (mapcar 'string-to-number
                              (directory-files nnmh-current-directory
                                               nil "^[0-9]+$" t))
                      '<))
@@ -580,4 +577,5 @@ as unread by Gnus.")
 
 (provide 'nnmh)
 
+;;; arch-tag: 36c12a98-3bad-44b3-9953-628078ef0e04
 ;;; nnmh.el ends here