diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/nnmail.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/shr-color.el | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 93dd22ff45b..2a4b97bd8d2 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,10 @@ 2010-11-26 Lars Magne Ingebrigtsen <larsi@gnus.org> + * nnmail.el (nnmail-expiry-target-group): Protect against degenerate + results from -accept-article. + + * shr-color.el: Require cl when compiling. + * nnheader.el (nnheader-update-marks-actions): Fix typo in last checkin. diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index e5af75419b4..06b464c0b29 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1916,7 +1916,8 @@ If TIME is nil, then return the cutoff time for oldness instead." (when (or (gnus-request-group target) (gnus-request-create-group target)) (let ((group-art (gnus-request-accept-article target nil t t))) - (when (consp group-art) + (when (and (consp group-art) + (cdr group-art)) (gnus-group-mark-article-read target (cdr group-art)))))))) (defun nnmail-fancy-expiry-target (group) diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el index 3346b43d964..779c30bc8f3 100644 --- a/lisp/gnus/shr-color.el +++ b/lisp/gnus/shr-color.el @@ -27,6 +27,7 @@ ;;; Code: (require 'color) +(eval-when-compile (require 'cl)) (defgroup shr-color nil "Simple HTML Renderer colors" |