# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1290739043 0
# Node ID f861f9db770afbc2929963c21a009992c0922b59
# Parent  a03d962cdb9e65924a513b9c0db00e10ab70108e
nnmail.el (nnmail-expiry-target-group): Protect against degenerate results from -accept-article.

diff -r a03d962cdb9e -r f861f9db770a lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri Nov 26 02:31:57 2010 +0000
+++ b/lisp/gnus/ChangeLog	Fri Nov 26 02:37:23 2010 +0000
@@ -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 -r a03d962cdb9e -r f861f9db770a lisp/gnus/nnmail.el
--- a/lisp/gnus/nnmail.el	Fri Nov 26 02:31:57 2010 +0000
+++ b/lisp/gnus/nnmail.el	Fri Nov 26 02:37:23 2010 +0000
@@ -1916,7 +1916,8 @@
       (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 -r a03d962cdb9e -r f861f9db770a lisp/gnus/shr-color.el
--- a/lisp/gnus/shr-color.el	Fri Nov 26 02:31:57 2010 +0000
+++ b/lisp/gnus/shr-color.el	Fri Nov 26 02:37:23 2010 +0000
@@ -27,6 +27,7 @@
 ;;; Code:
 
 (require 'color)
+(eval-when-compile (require 'cl))
 
 (defgroup shr-color nil
   "Simple HTML Renderer colors"