diff lisp/gnus/nnweb.el @ 72425:4fa1b5c6a34c

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 123-125) - Update from CVS 2006-08-09 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/compface.el (uncompface): Use binary rather than raw-text-unix. 2006-08-09 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/compface.el (uncompface): Make sure the eol conversion doesn't take place when communicating with the external programs. Reported by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>. 2006-07-31 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/nnheader.el (nnheader-insert-head): Fix typo in comment. 2006-07-31 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * lisp/gnus/nnweb.el (nnweb-google-parse-1): Update regexp for author and date. Make it more robust by parsing author and date independently. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-398
author Miles Bader <miles@gnu.org>
date Wed, 16 Aug 2006 14:04:41 +0000
parents 002ee31c5102
children 0fd7f29f20d1 7f3f771c85fa
line wrap: on
line diff
--- a/lisp/gnus/nnweb.el	Wed Aug 16 12:33:12 2006 +0000
+++ b/lisp/gnus/nnweb.el	Wed Aug 16 14:04:41 2006 +0000
@@ -366,14 +366,15 @@
       (mm-url-decode-entities)
       (search-backward " - ")
       (when (looking-at
-	     " - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?[^\n]+by ?\n?\\([^<\n]+\\)\n")
-	(setq From (match-string 4)
-	      Date (format "%s %s 00:00:00 %s"
+	     "\\W+\\(\\w+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?")
+	(setq Date (format "%s %s 00:00:00 %s"
 			   (match-string 1)
 			   (match-string 2)
 			   (or (match-string 3)
-			       (substring (current-time-string) -4)))))
-
+			       (substring (current-time-string) -4))))
+	(goto-char (match-end 0)))
+      (when (looking-at "[^b]+by\\W+\\([^<\n]+\\)")
+	(setq From (match-string 1)))
       (widen)
       (forward-line 1)
       (incf i)