[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102525: nnmail.el (nnmail-expiry-tar
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102525: nnmail.el (nnmail-expiry-target-group): Protect against degenerate results from -accept-article. |
Date: |
Fri, 26 Nov 2010 02:37:23 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102525
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2010-11-26 02:37:23 +0000
message:
nnmail.el (nnmail-expiry-target-group): Protect against degenerate results
from -accept-article.
modified:
lisp/gnus/ChangeLog
lisp/gnus/nnmail.el
lisp/gnus/shr-color.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-11-26 02:31:57 +0000
+++ b/lisp/gnus/ChangeLog 2010-11-26 02:37:23 +0000
@@ -1,5 +1,10 @@
2010-11-26 Lars Magne Ingebrigtsen <address@hidden>
+ * 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.
=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el 2010-11-01 06:21:44 +0000
+++ b/lisp/gnus/nnmail.el 2010-11-26 02:37:23 +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)
=== modified file 'lisp/gnus/shr-color.el'
--- a/lisp/gnus/shr-color.el 2010-11-25 14:51:51 +0000
+++ b/lisp/gnus/shr-color.el 2010-11-26 02:37:23 +0000
@@ -27,6 +27,7 @@
;;; Code:
(require 'color)
+(eval-when-compile (require 'cl))
(defgroup shr-color nil
"Simple HTML Renderer colors"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102525: nnmail.el (nnmail-expiry-target-group): Protect against degenerate results from -accept-article.,
Katsumi Yamaoka <=