nnmail.el (nnmail-expiry-target-group): Protect against degenerate results from ...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 93dd22f..2a4b97b 100644 (file)
--- 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 e5af754..06b464c 100644 (file)
--- 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 3346b43..779c30b 100644 (file)
--- 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"