From 73ab9865e6c50586fcfced729824b3aabd03bbae Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 2 Nov 2010 20:25:23 -0700 Subject: [PATCH] Silence compilation of nndiary.el. * lisp/gnus/nndiary.el (nndiary-generate-nov-databases-1) (nndiary-generate-active-info): Rename dynamic variable `files' to something less generic. --- lisp/gnus/ChangeLog | 10 ++++++++-- lisp/gnus/nndiary.el | 12 ++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 0f64afdc323..43ec85c8879 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,11 +1,17 @@ +2010-11-03 Glenn Morris + + * nndiary.el (nndiary-generate-nov-databases-1) + (nndiary-generate-active-info): Rename dynamic variable `files' to + something less generic. + 2010-11-03 Andrew Cohen - * nnir.el (nnir-request-move-article): call the underlying backend to + * nnir.el (nnir-request-move-article): Call the underlying backend to move articles from nnir. 2010-11-02 Lars Magne Ingebrigtsen - * gnus-cite.el (gnus-article-natural-long-line-p): Removed. + * gnus-cite.el (gnus-article-natural-long-line-p): Remove. 2010-11-02 Julien Danjou diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index 7235e4b0332..e634b9cada3 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/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))) -- 2.11.4.GIT