X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnweb.el;h=e93373e8a8f5c01834e677cad7fc9ae965b673ea;hb=09397c64b29d8d18c18206d8adc27a8424fe76ee;hp=37cf7a3d68fe4aaebf63fea450f32f4088c78408;hpb=acc64cd78d389fb6c3d2a497af37be51ca385b21;p=gnus

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 37cf7a3d6..e93373e8a 100644
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -171,7 +171,8 @@ Valid types include `google', `dejanews', and `gmane'.")
 		       (when (string-match "^<\\(.*\\)>$" article)
 			 (setq art (match-string 1 article)))
 		       (when (and fetch art)
-			 (setq url (format fetch art))
+			 (setq url (format fetch
+					   (mm-url-form-encode-xwfu art)))
 			 (mm-with-unibyte-current-buffer
 			   (mm-url-insert url))
 			 (if (nnweb-definition 'reference t)
@@ -307,8 +308,8 @@ Valid types include `google', `dejanews', and `gmane'.")
 (defun nnweb-google-wash-article ()
   ;; We have Google's masked e-mail addresses here.  :-/
   (let ((case-fold-search t)
-	(start-re "<pre>\n *")
-	(end-re "\n *</pre>"))
+	(start-re "<pre>[\r\n ]*")
+	(end-re "[\r\n ]*</pre>"))
     (goto-char (point-min))
     (if (save-excursion
 	  (or (re-search-forward "The requested message.*could not be found."