[Emacs-diffs] /srv/bzr/emacs/trunk r102272: Silence gnus-art compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 102272
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-11-06 12:35:19 -0700
message:
  Silence gnus-art compilation.
  * lisp/gnus/gnus-art.el (gnus-treat-article): Give dynamic local variables
  `condition', `type', `length' a prefix.
  (gnus-treat-predicate): Update for above name changes.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-04 22:18:09 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-06 19:35:19 +0000
@@ -1,13 +1,19 @@
+2010-11-06  Glenn Morris  <address@hidden>
+
+       * gnus-art.el (gnus-treat-article): Give dynamic local variables
+       `condition', `type', `length' a prefix.
+       (gnus-treat-predicate): Update for above name changes.
+
 2010-11-04  Andrew Cohen  <address@hidden>
 
-       * nnir.el (gnus-summary-nnir-goto-thread): limiting work done by
+       * nnir.el (gnus-summary-nnir-goto-thread): Limit work done by
        gnus-summary-refer-thread.
 
-       * gnus-sum.el (gnus-build-all-threads): force updating of dependency
+       * gnus-sum.el (gnus-build-all-threads): Force updating of dependency
        headers.
-       (gnus-summary-limit-include-thread): prevent articles in thread from
+       (gnus-summary-limit-include-thread): Prevent articles in thread from
        being cut in gnus-cut-threads.
-       (gnus-summary-refer-thread): limit retrieved headers to those in
+       (gnus-summary-refer-thread): Limit retrieved headers to those in
        thread.
 
 2010-11-04  Lars Magne Ingebrigtsen  <address@hidden>

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2010-10-31 22:31:24 +0000
+++ b/lisp/gnus/gnus-art.el     2010-11-06 19:35:19 +0000
@@ -8257,16 +8257,17 @@
 
 (defvar gnus-inhibit-article-treatments nil)
 
-(defun gnus-treat-article (condition &optional part-number total-parts type)
-  (let ((length (- (point-max) (point-min)))
+(defun gnus-treat-article (gnus-treat-condition
+                          &optional part-number total-parts gnus-treat-type)
+  (let ((gnus-treat-length (- (point-max) (point-min)))
        (alist gnus-treatment-function-alist)
        (article-goto-body-goes-to-point-min-p t)
        (treated-type
-        (or (not type)
+        (or (not gnus-treat-type)
             (catch 'found
               (let ((list gnus-article-treat-types))
                 (while list
-                  (when (string-match (pop list) type)
+                  (when (string-match (pop list) gnus-treat-type)
                     (throw 'found t)))))))
        (highlightp (gnus-visual-p 'article-highlight 'highlight))
        val elem)
@@ -8280,7 +8281,7 @@
       (when (and (or (consp val)
                     treated-type)
                 (or (not gnus-inhibit-article-treatments)
-                    (eq condition 'head))
+                    (eq gnus-treat-condition 'head))
                 (gnus-treat-predicate val)
                 (or (not (get (car elem) 'highlight))
                     highlightp))
@@ -8290,16 +8291,16 @@
 ;; Dynamic variables.
 (defvar part-number)
 (defvar total-parts)
-(defvar type)
-(defvar condition)
-(defvar length)
+(defvar gnus-treat-type)
+(defvar gnus-treat-condition)
+(defvar gnus-treat-length)
 
 (defun gnus-treat-predicate (val)
   (cond
    ((null val)
     nil)
-   (condition
-    (eq condition val))
+   (gnus-treat-condition
+    (eq gnus-treat-condition val))
    ((and (listp val)
         (stringp (car val)))
     (apply 'gnus-or (mapcar `(lambda (s)
@@ -8315,7 +8316,7 @@
        ((eq pred 'not)
        (not (gnus-treat-predicate (car val))))
        ((eq pred 'typep)
-       (equal (car val) type))
+       (equal (car val) gnus-treat-type))
        (t
        (error "%S is not a valid predicate" pred)))))
    ((eq val t)
@@ -8327,7 +8328,7 @@
    ((eq val 'last)
     (eq part-number total-parts))
    ((numberp val)
-    (< length val))
+    (< gnus-treat-length val))
    (t
     (error "%S is not a valid value" val))))