gnus-msg.el (gnus-setup-message): Fix last commit

[gnus] / lisp / nnmh.el

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index ba9eb23..87f093e 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-2013 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -149,7 +148,7 @@ as unread by Gnus.")
         (save-excursion (nnmail-find-file file))
         (string-to-number (file-name-nondirectory file)))))
 
-(deffoo nnmh-request-group (group &optional server dont-check)
+(deffoo nnmh-request-group (group &optional server dont-check info)
   (nnheader-init-server-buffer)
   (nnmh-possibly-change-directory group server)
   (let ((pathname (nnmail-group-pathname group nnmh-directory))
@@ -209,9 +208,11 @@ as unread by Gnus.")
   ;; Recurse down all directories.
   (let ((files (nnheader-directory-files dir t nil t))
        (max 0)
-       min rdir num subdirectoriesp)
+       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))
@@ -248,7 +249,7 @@ as unread by Gnus.")
               ?/ ?.)
              nnmail-pathname-coding-system)))
          (or max 0)
-         (or min 0))))))
+         (or min 1))))))
   t)
 
 (deffoo nnmh-request-newgroups (date &optional server)
@@ -258,9 +259,6 @@ 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))
        article rest mod-time)
     (nnheader-init-server-buffer)