[Emacs-diffs] /srv/bzr/emacs/trunk r101837: * lisp/gnus/gnus-sum.el (gnus-number): Rename from `number'.

[Stefan Monnier]

------------------------------------------------------------
revno: 101837
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2010-10-07 20:22:07 +0200
message:
  * lisp/gnus/gnus-sum.el (gnus-number): Rename from `number'.
  (gnus-article-marked-p, gnus-summary-limit-to-display-predicate)
  (gnus-summary-limit-children): Update uses correspondingly.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-10-07 12:31:39 +0000
+++ b/lisp/gnus/ChangeLog       2010-10-07 18:22:07 +0000
@@ -1,3 +1,9 @@
+2010-10-07  Stefan Monnier  <address@hidden>
+
+       * gnus-sum.el (gnus-number): Rename from `number'.
+       (gnus-article-marked-p, gnus-summary-limit-to-display-predicate)
+       (gnus-summary-limit-children): Update uses correspondingly.
+
 2010-10-07  Katsumi Yamaoka  <address@hidden>
 
        * gnus-gravatar.el (gnus-gravatar-too-ugly): New user option.

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2010-10-06 01:09:32 +0000
+++ b/lisp/gnus/gnus-sum.el     2010-10-07 18:22:07 +0000
@@ -5682,17 +5682,17 @@
                            (unseen . unseen))
                          gnus-article-mark-lists))
       (push (cons (cdr elem)
-                 (gnus-byte-compile
+                 (gnus-byte-compile    ;Why bother?
                   `(lambda () (gnus-article-marked-p ',(cdr elem)))))
            gnus-summary-display-cache)))
   (let ((gnus-category-predicate-alist gnus-summary-display-cache)
        (gnus-category-predicate-cache gnus-summary-display-cache))
     (gnus-get-predicate display)))
 
-;; Uses the dynamically bound `number' variable.
-(defvar number)
+;; Uses the dynamically bound `gnus-number' variable.
+(defvar gnus-number)
 (defun gnus-article-marked-p (type &optional article)
-  (let ((article (or article number)))
+  (let ((article (or article gnus-number)))
     (cond
      ((eq type 'tick)
       (memq article gnus-newsgroup-marked))
@@ -8283,9 +8283,9 @@
   (unless gnus-newsgroup-display
     (error "There is no `display' group parameter"))
   (let (articles)
-    (dolist (number gnus-newsgroup-articles)
+    (dolist (gnus-number gnus-newsgroup-articles)
       (when (funcall gnus-newsgroup-display)
-       (push number articles)))
+       (push gnus-number articles)))
     (gnus-summary-limit articles))
   (gnus-summary-position-point))
 
@@ -8686,7 +8686,7 @@
               (apply '+ (mapcar 'gnus-summary-limit-children
                                 (cdr thread)))
             0))
-         (number (mail-header-number (car thread)))
+           (number (mail-header-number (car thread)))
          score)
       (if (and
           (not (memq number gnus-newsgroup-marked))
@@ -8732,7 +8732,8 @@
              t)
            ;; Do the `display' group parameter.
            (and gnus-newsgroup-display
-                (not (funcall gnus-newsgroup-display)))))
+                 (let ((gnus-number number))
+                   (not (funcall gnus-newsgroup-display))))))
          ;; Nope, invisible article.
          0
        ;; Ok, this article is to be visible, so we add it to the limit