Mercurial > emacs
diff lisp/gnus/gnus-sum.el @ 110809:b3be868d9343
* 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.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 07 Oct 2010 20:22:07 +0200 |
parents | 9d935b7bf464 |
children | 07053df95af6 |
line wrap: on
line diff
--- a/lisp/gnus/gnus-sum.el Thu Oct 07 10:30:10 2010 -0700 +++ b/lisp/gnus/gnus-sum.el Thu Oct 07 20:22:07 2010 +0200 @@ -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