Mercurial > emacs
changeset 111326:0b85687890f8
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 02 Nov 2010 20:25:23 -0700 |
| parents | 9aff83bb4de1 |
| children | 27839df805b0 |
| files | lisp/gnus/ChangeLog lisp/gnus/nndiary.el |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Nov 02 22:30:12 2010 -0400 +++ b/lisp/gnus/ChangeLog Tue Nov 02 20:25:23 2010 -0700 @@ -1,11 +1,17 @@ +2010-11-03 Glenn Morris <rgm@gnu.org> + + * nndiary.el (nndiary-generate-nov-databases-1) + (nndiary-generate-active-info): Rename dynamic variable `files' to + something less generic. + 2010-11-03 Andrew Cohen <cohen@andy.bu.edu> - * 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 <larsi@gnus.org> - * 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 <julien@danjou.info>
--- a/lisp/gnus/nndiary.el Tue Nov 02 22:30:12 2010 -0400 +++ b/lisp/gnus/nndiary.el Tue Nov 02 20:25:23 2010 -0700 @@ -1061,9 +1061,9 @@ (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 @@ (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 @@ (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)))