*** empty log message ***

[gnus] / lisp / nnmbox.el

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index 77b4d26..6b2c67f 100644 (file)
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -118,11 +118,8 @@
           gnus-verbose-backends
           (message "nnmbox: Receiving headers...done"))
 
-      ;; Fold continuation lines.
       (set-buffer nntp-server-buffer)
-      (goto-char (point-min))
-      (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-       (replace-match " " t t))
+      (nnheader-fold-continuation-lines)
       'headers)))
 
 (defun nnmbox-open-server (server &optional defs)
@@ -241,10 +238,7 @@
 (defun nnmbox-request-expire-articles 
   (articles newsgroup &optional server force)
   (nnmbox-possibly-change-newsgroup newsgroup)
-  (let* ((days (or (and nnmail-expiry-wait-function
-                       (funcall nnmail-expiry-wait-function newsgroup))
-                  nnmail-expiry-wait))
-        (is-old t)
+  (let* ((is-old t)
         rest)
     (nnmail-activate 'nnmbox)
 
@@ -253,13 +247,11 @@
       (while (and articles is-old)
        (goto-char (point-min))
        (if (search-forward (nnmbox-article-string (car articles)) nil t)
-           (if (or force
-                   (setq is-old
-                         (> (nnmail-days-between 
-                             (current-time-string)
-                             (buffer-substring 
-                              (point) (progn (end-of-line) (point))))
-                            days)))
+           (if (setq is-old
+                     (nnmail-expired-article-p
+                      newsgroup
+                      (buffer-substring 
+                       (point) (progn (end-of-line) (point))) force))
                (progn
                  (and gnus-verbose-backends
                       (message "Deleting article %d in %s..."