4 files changed, 48 insertions, 24 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3da68ecb902..6ddd513610a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -3,6 +3,25 @@
         * mm-extern.el (mm-extern-mail-server): End `y-or-n-p' prompt with a
         space.
 
+2006-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * compface.el (uncompface): Use binary rather than raw-text-unix.
+
+2006-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * 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>
+
+        * nnheader.el (nnheader-insert-head): Fix typo in comment.
+
+2006-07-31  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
+        Make it more robust by parsing author and date independently.
+
 2006-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * nnheader.el (nnheader-insert-head): Make it work with Mac as well.
diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el
index f6bd9bfd720..33e05046e84 100644
--- a/lisp/gnus/compface.el
+++ b/lisp/gnus/compface.el
@@ -34,24 +34,28 @@ GNU/Linux system these might be in packages with names like `compface'
 or `faces-xface' and `netpbm' or `libgr-progs', for instance."
   (with-temp-buffer
     (insert face)
-    (and (eq 0 (apply 'call-process-region (point-min) (point-max)
-                      "uncompface"
-                      'delete '(t nil) nil))
-         (progn
-           (goto-char (point-min))
-           (insert "/* Width=48, Height=48 */\n")
-           ;; I just can't get "icontopbm" to work correctly on its
-           ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
-           ;; files.
-           (if (not (featurep 'xemacs))
-               (eq 0 (call-process-region (point-min) (point-max)
-                                          "icontopbm"
-                                          'delete '(t nil)))
-             (shell-command-on-region (point-min) (point-max)
-                                      "icontopbm | pnmnoraw"
-                                      (current-buffer) t)
-             t))
-         (buffer-string))))
+    (let ((coding-system-for-read 'raw-text)
+          ;; At least "icontopbm" doesn't work with Windows because
+          ;; the line-break code is converted into CRLF by default.
+          (coding-system-for-write 'binary))
+      (and (eq 0 (apply 'call-process-region (point-min) (point-max)
+                        "uncompface"
+                        'delete '(t nil) nil))
+           (progn
+             (goto-char (point-min))
+             (insert "/* Width=48, Height=48 */\n")
+             ;; I just can't get "icontopbm" to work correctly on its
+             ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
+             ;; files.
+             (if (not (featurep 'xemacs))
+                 (eq 0 (call-process-region (point-min) (point-max)
+                                            "icontopbm"
+                                            'delete '(t nil)))
+               (shell-command-on-region (point-min) (point-max)
+                                        "icontopbm | pnmnoraw"
+                                        (current-buffer) t)
+               t))
+           (buffer-string)))))
 
 (provide 'compface)
 
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 79732cd3d88..82e1d3ab554 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -598,7 +598,7 @@ the line could be found."
                         (nth 1 (mm-insert-file-contents
                                 file nil beg
                                 (incf beg nnheader-head-chop-length))))
-                    ;; CRLF of CR might be used for the line-break code.
+                    ;; CRLF or CR might be used for the line-break code.
                     (prog1 (not (re-search-forward "\n\r?\n\\|\r\r" nil t))
                       (goto-char (point-max)))
                     (or (null nnheader-max-head-length)
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 7c0c8e0e444..d020d533aea 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -366,14 +366,15 @@ Valid types include `google', `dejanews', and `gmane'.")
       (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)