Re: nnweb fix

[Andreas Seltenreich <andreas+ding@gate450.dyndns.org>]

[-- Attachment #1: Type: text/plain, Size: 734 bytes --]

Hi,

it looks like the regexps in nnweb-google-wash-article broke in the
meantime. Attached is an update.

I also reverted the change to declare nnweb-group-alist with defvar
instead of defvoo. I didn't realise that it is held on disk
/multiplexed/ with the defvoo'd nnweb-directory, which would result in
bogus active file entries if one would use more than one directory for
nnweb.

Also, nnlistserv seems to inherit from nnweb via nnoo, and I'm not
sure what the implications are, if it wasn't declared with defvoo
(anyone)?

regards,
Andreas

2006-02-12  Andreas Seltenreich  <uwi7@stud.uni-karlsruhe.de>

        * nnweb.el (nnweb-google-wash-article): Update regexps.
        (nnweb-group-alist): Use defvoo instead of defvar,


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: nnweb.patch --]
[-- Type: text/x-patch, Size: 1593 bytes --]

Index: nnweb.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/nnweb.el,v
retrieving revision 7.14
diff -u -r7.14 nnweb.el
--- nnweb.el	3 Feb 2006 13:15:13 -0000	7.14
+++ nnweb.el	12 Feb 2006 05:55:27 -0000
@@ -99,7 +99,7 @@
 
 (defvoo nnweb-articles nil)
 (defvoo nnweb-buffer nil)
-(defvar nnweb-group-alist nil)
+(defvoo nnweb-group-alist nil)
 (defvoo nnweb-group nil)
 (defvoo nnweb-hashtb nil)
 
@@ -309,22 +309,26 @@
 
 (defun nnweb-google-wash-article ()
   ;; We have Google's masked e-mail addresses here.  :-/
-  (let ((case-fold-search t))
+  (let ((case-fold-search t)
+	(start-re "<pre>\n *")
+	(end-re "\n *</pre>"))
     (goto-char (point-min))
     (if (save-excursion
 	  (or (re-search-forward "The requested message.*could not be found."
 				 nil t)
-	      (not (and (re-search-forward "^<pre>" nil t)
-			(re-search-forward "^</pre>" nil t)))))
+	      (not (and (re-search-forward start-re nil t)
+			(re-search-forward end-re nil t)))))
 	;; FIXME: Don't know how to indicate "not found".
 	;; Should this function throw an error?  --rsteib
 	(progn
 	  (gnus-message 3 "Requested article not found")
 	  (erase-buffer))
       (delete-region (point-min)
-		     (1+ (re-search-forward "^<pre>" nil t)))
+		     (re-search-forward start-re))
       (goto-char (point-min))
-      (delete-region (- (re-search-forward "^</pre>" nil t) (length "</pre>"))
+      (delete-region (progn
+		       (re-search-forward end-re)
+		       (match-beginning 0))
 		     (point-max))
       (mm-url-decode-entities))))