2006-04-30 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>

[gnus] / lisp / nnweb.el

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 37cf7a3..e93373e 100644 (file)
--- 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."