From: yamaoka <yamaoka>
Date: Thu, 24 Apr 2003 23:12:47 +0000 (+0000)
Subject: Synch to Oort Gnus 200304242314.
X-Git-Tag: t-gnus-6_15_20-00-quimby~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=72ded5e106e8b168768073333b5703e7a115dc58;p=elisp%2Fgnus.git-

Synch to Oort Gnus 200304242314.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd9aca0..123475d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-25  Simon Josefsson  <jas@extundo.com>
+
+	* nnrss.el (nnrss-node-text): Don't use a star.
+	(nnrss-node-text): Use g-r-i-s, not g-r-r-i-s which doesn't exist.
+
 2003-04-24  Dave Love  <fx@gnu.org>
 
 	* qp.el (quoted-printable-decode-region): Use mm-insert-byte.
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 161d88b..5cc9069 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -518,12 +518,12 @@ It is useful when `(setq nnrss-use-local t)'."
 	 (text (if (and node (listp node))
 		   (nnrss-node-just-text node)
 		 node))
-	 (cleaned-text (if text (gnus-replace-regexp-in-string
-				 (gnus-replace-regexp-in-string
-				  (gnus-replace-regexp-in-string
+	 (cleaned-text (if text (gnus-replace-in-string
+				 (gnus-replace-in-string
+				  (gnus-replace-in-string
 				   text "^[[:cntrl:]]+" "")
-				  "^ *" "")
-				 " *$" ""))))
+				  "^ +" "")
+				 " +$" ""))))
     (if (string-equal "" cleaned-text)
 	nil
       cleaned-text)))