From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 7 Oct 2010 22:22:38 +0000 (+0000)
Subject: gnus-sum.el (gnus-number): Rename from `number'.
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;ds=sidebyside;h=ee84116e7c47c651bdc7550c3f02be841e2fc3df;p=gnus

gnus-sum.el (gnus-number): Rename from `number'.
gnus-sum.el (gnus-article-marked-p, gnus-summary-limit-to-display-predicate, gnus-summary-limit-children): Update uses correspondingly.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50e6310b2..0b0ab9fa1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,12 @@
 	(shr-insert-table): Also insert empty TDs.
 	(shr-tag-blockquote): Ensure paragraphs after </ul>.
 
+2010-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* 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  <yamaoka@jpl.org>
 
 	* gnus-gravatar.el (gnus-gravatar-too-ugly): New user option.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index dc6882ac0..c45536c25 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5682,17 +5682,17 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 			    (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 @@ articles that are younger than AGE days."
   (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,8 +8686,8 @@ fetch-old-headers verbiage, and so on."
 	       (apply '+ (mapcar 'gnus-summary-limit-children
 				 (cdr thread)))
 	     0))
-	  (number (mail-header-number (car thread)))
-	  score)
+	   (number (mail-header-number (car thread)))
+	   score)
       (if (and
 	   (not (memq number gnus-newsgroup-marked))
 	   (or
@@ -8732,7 +8732,8 @@ fetch-old-headers verbiage, and so on."
 	      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