(message-setup-1): Mark buffer as unmodified _after_ running

[gnus] / lisp / nnmh.el

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index cd0b1b0..88730a2 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, 2003
-;;     Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -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 'string-to-int
+              (mapcar 'string-to-number
                       (directory-files pathname nil "^[0-9]+$" t))
               '<))
        (cond
@@ -222,7 +222,7 @@ 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 'string-to-int
+    (let ((files (mapcar 'string-to-number
                         (directory-files dir nil "^[0-9]+$" t))))
       (when files
        (save-excursion
@@ -253,8 +253,11 @@ as unread by Gnus.")
 (deffoo nnmh-request-expire-articles (articles newsgroup
                                               &optional server force)
   (nnmh-possibly-change-directory newsgroup server)
-  (let* ((is-old t)
-        article rest mod-time)
+  (let ((is-old t)
+       (nnmail-expiry-target
+        (or (gnus-group-find-parameter newsgroup 'expiry-target t)
+            nnmail-expiry-target))
+       article rest mod-time)
     (nnheader-init-server-buffer)
 
     (while (and articles is-old)
@@ -288,8 +291,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
@@ -354,7 +357,7 @@ as unread by Gnus.")
            nnmh-group-alist)
       (nnmh-possibly-create-directory group)
       (nnmh-possibly-change-directory group server)
-      (let ((articles (mapcar 'string-to-int
+      (let ((articles (mapcar 'string-to-number
                              (directory-files
                               nnmh-current-directory nil "^[0-9]+$"))))
        (when articles
@@ -480,7 +483,7 @@ as unread by Gnus.")
        (gnus-make-directory dir))
       ;; Find the highest number in the group.
       (let ((files (sort
-                   (mapcar 'string-to-int
+                   (mapcar 'string-to-number
                            (directory-files dir nil "^[0-9]+$"))
                    '>)))
        (when files
@@ -503,7 +506,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 'string-to-int
+        (files (sort (mapcar 'string-to-number
                              (directory-files nnmh-current-directory
                                               nil "^[0-9]+$" t))
                      '<))
@@ -577,4 +580,5 @@ as unread by Gnus.")
 
 (provide 'nnmh)
 
+;;; arch-tag: 36c12a98-3bad-44b3-9953-628078ef0e04
 ;;; nnmh.el ends here