[Emacs-diffs] /srv/bzr/emacs/trunk r102227: Silence compilation of nndiary.el.

[Glenn Morris]

------------------------------------------------------------
revno: 102227
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-02 20:25:23 -0700
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nndiary.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-03 01:06:33 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-03 03:25:23 +0000
@@ -1,11 +1,17 @@
+2010-11-03  Glenn Morris  <address@hidden>
+
+       * nndiary.el (nndiary-generate-nov-databases-1)
+       (nndiary-generate-active-info): Rename dynamic variable `files' to
+       something less generic.
+
 2010-11-03  Andrew Cohen  <address@hidden>
 
-       * 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  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/gnus/nndiary.el'
--- a/lisp/gnus/nndiary.el      2010-09-18 23:36:29 +0000
+++ b/lisp/gnus/nndiary.el      2010-11-03 03:25:23 +0000
@@ -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)))