* mml-sec.el (mml-secure-cust-record-keys):

[gnus] / lisp / nnmh.el

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index cdd540a..c60e845 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -1,7 +1,6 @@
 ;;; nnmh.el --- mhspool access for Gnus
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2016 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -110,7 +109,7 @@ as unread by Gnus.")
          (and large
               (zerop (% count 20))
               (nnheader-message 5 "nnmh: Receiving headers... %d%%"
-                                (/ (* count 100) number))))
+                                (floor (* count 100.0) number))))
 
        (when large
          (nnheader-message 5 "nnmh: Receiving headers...done"))
@@ -211,7 +210,9 @@ as unread by Gnus.")
        (max 0)
        min rdir num subdirectoriesp file)
     ;; Recurse down directories.
-    (setq subdirectoriesp (> (nth 1 (file-attributes dir)) 2))
+    (setq subdirectoriesp
+         ;; nth 1 of file-attributes always 1 on MS Windows :(
+         (/= (nth 1 (file-attributes (file-truename dir))) 2))
     (dolist (rdir files)
       (if (or (not subdirectoriesp)
              (file-regular-p rdir))
@@ -258,15 +259,12 @@ as unread by Gnus.")
                                               &optional server force)
   (nnmh-possibly-change-directory newsgroup server)
   (let ((is-old t)
-       (nnmail-expiry-target
-        (or (gnus-group-find-parameter newsgroup 'expiry-target t)
-            nnmail-expiry-target))
+       (dir nnmh-current-directory)
        article rest mod-time)
     (nnheader-init-server-buffer)
 
     (while (and articles is-old)
-      (setq article (concat nnmh-current-directory
-                           (int-to-string (car articles))))
+      (setq article (concat dir (int-to-string (car articles))))
       (when (setq mod-time (nth 5 (file-attributes article)))
        (if (and (nnmh-deletable-article-p newsgroup (car articles))
                 (setq is-old