diff options
| author | Dave Abrahams <dave@boostpro.com> | 2012-08-31 04:39:30 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-08-31 04:39:30 +0000 |
| commit | c20643e2105117277d0b1d1880848e2ab31b967c (patch) | |
| tree | db11e3362bdc77f1b50027ce191b22f18bc399f8 /lisp/gnus/gnus-int.el | |
| parent | 4e0f64791b6f38bfaa8d84addf7a472a15aac111 (diff) | |
| download | emacs-c20643e2105117277d0b1d1880848e2ab31b967c.tar.gz | |
[Gnus] Miscellaneous fixes by Dave Abrahams
Diffstat (limited to 'lisp/gnus/gnus-int.el')
| -rw-r--r-- | lisp/gnus/gnus-int.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el index 339e3d951c2..bc3ba187dd4 100644 --- a/lisp/gnus/gnus-int.el +++ b/lisp/gnus/gnus-int.el @@ -599,7 +599,8 @@ real group. Does nothing on a real group." clean-up t)) ;; Use `head' function. ((fboundp head) - (setq res (funcall head article (gnus-group-real-name group) + (setq res (funcall head article + (and (not gnus-override-method) (gnus-group-real-name group)) (nth 1 gnus-command-method)))) ;; Use `article' function. (t @@ -706,6 +707,10 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned." (defun gnus-request-expire-articles (articles group &optional force) (let* ((gnus-command-method (gnus-find-method-for-group group)) + ;; Filter out any negative article numbers; they can't be + ;; expired here. + (articles + (delq nil (mapcar (lambda (n) (and (>= n 0) n)) articles))) (gnus-inhibit-demon t) (not-deleted (funcall |