Merge from emacs--devo--0, emacs--rel--22

[gnus] / lisp / nnrss.el

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 2e64360..f72166b 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -195,9 +195,8 @@ used to render text.  If it is nil, text will simply be folded.")
 (deffoo nnrss-close-group (group &optional server)
   t)
 
-(eval-when-compile
-  (defvar mm-text-html-renderer)
-  (defvar mm-text-html-washer-alist))
+(defvar mm-text-html-renderer)
+(defvar mm-text-html-washer-alist)
 
 (deffoo nnrss-request-article (article &optional group server buffer)
   (setq group (nnrss-decode-group-name group))
@@ -680,7 +679,7 @@ which RSS 2.0 allows."
 ;;; Snarf functions
 
 (defun nnrss-make-hash-index (item)
-  (setq item (remove-if
+  (setq item (gnus-remove-if
              (lambda (field)
                (when (listp field)
                  (memq (car field) nnrss-ignore-article-fields)))