nndiary.el: Silence compilation.

gnus.texi (Agent Variables): Spelling fix.
gnus.texi (Configuring nnmairix): Spelling fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 618fd45..25b60d6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 
@@ -25,10 +31,10 @@
 
 2010-11-01  Andrew Cohen  <cohen@andy.bu.edu>
 
-       * nnir.el (nnir-run-gmane): inhibit demon. return nil if no messages.
-       (nnir-read-parms): don't modify query.
-       (nnir-run-query): add ability to search topic on current line.
-       (nnir-get-active): clean up.
+       * nnir.el (nnir-run-gmane): Inhibit demon.  Return nil if no messages.
+       (nnir-read-parms): Don't modify query.
+       (nnir-run-query): Add ability to search topic on current line.
+       (nnir-get-active): Clean up.
 
 2010-11-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/lisp/nndiary.el b/lisp/nndiary.el
index 7235e4b..e634b9c 100644 (file)
--- 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)))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2dc6647..7326a1b 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-03  Glenn Morris  <rgm@gnu.org>
+
+       * gnus.texi (Agent Variables, Configuring nnmairix): Spelling fix.
+
 2010-10-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Paging the Article): Document C-u g/C-u C-u g.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 207ca42..50fdd39 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -4556,7 +4556,7 @@ However, you can also create e.g. a new @code{nnmaildir} or @code{nnml}
 server exclusively for @code{nnmairix} in your secondary select methods
 (@pxref{Finding the News}).  If you use a secondary @code{nnml} server
 just for mairix, make sure that you explicitly set the server variable
-@code{nnml-get-new-mail} to @code{nil}, or you might loose mail
+@code{nnml-get-new-mail} to @code{nil}, or you might lose mail
 (@pxref{nnmairix caveats}).  If you want to use mairix remotely on an
 @acronym{IMAP} server, you have to choose the corresponding
 @code{nnimap} server here.
@@ -19840,7 +19840,7 @@ limit to control how often the cycling occurs.  A large value improves
 performance.  A small value minimizes the time lost should the
 connection be lost while fetching (You may need to run
 @code{gnus-agent-regenerate-group} to update the group's state.
-However, all articles parsed prior to loosing the connection will be
+However, all articles parsed prior to losing the connection will be
 available while unplugged).  The default is 10M so it is unusual to
 see any cycling.