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

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.
 

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)

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"