X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnndiary.el;h=e634b9cada366c8b627432a81b983700fda2fb98;hb=0007de6d40db139c025a8b2cba9ef04ee4837608;hp=7235e4b0332aa4e7c7165565038f2ddc9d5434b7;hpb=aaff5cad4b7225cd056a7c322950b9887e3442c0;p=gnus diff --git a/lisp/nndiary.el b/lisp/nndiary.el index 7235e4b03..e634b9cad 100644 --- a/lisp/nndiary.el +++ b/lisp/nndiary.el @@ -1061,9 +1061,9 @@ all. This may very well take some time.") (file-directory-p dir)) (nndiary-generate-nov-databases-1 dir seen)))) ;; Do this directory. - (let ((files (sort (nnheader-article-to-file-alist dir) + (let ((nndiary-files (sort (nnheader-article-to-file-alist dir) 'car-less-than-car))) - (if (not files) + (if (not nndiary-files) (let* ((group (nnheader-file-to-group (directory-file-name dir) nndiary-directory)) (info (cadr (assoc group nndiary-group-alist)))) @@ -1071,11 +1071,11 @@ all. This may very well take some time.") (setcar info (1+ (cdr info))))) (funcall nndiary-generate-active-function dir) ;; Generate the nov file. - (nndiary-generate-nov-file dir files) + (nndiary-generate-nov-file dir nndiary-files) (unless no-active (nnmail-save-active nndiary-group-alist nndiary-active-file)))))) -(defvar files) +(defvar nndiary-files) ; dynamically bound in nndiary-generate-nov-databases-1 (defun nndiary-generate-active-info (dir) ;; Update the active info for this group. (let* ((group (nnheader-file-to-group @@ -1084,9 +1084,9 @@ all. This may very well take some time.") (last (or (caadr entry) 0))) (setq nndiary-group-alist (delq entry nndiary-group-alist)) (push (list group - (cons (or (caar files) (1+ last)) + (cons (or (caar nndiary-files) (1+ last)) (max last - (or (caar (last files)) + (or (caar (last nndiary-files)) 0)))) nndiary-group-alist)))