Synch with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ca328b..d86b4a6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-18  Simon Josefsson  <simon@josefsson.org>
+
+       * nnheader.el (nnheader-parse-head): Try both "from:" and "from: ".
+
+       * gnus-sum.el (gnus-get-newsgroup-headers): Ditto.
+
 2000-10-17  Simon Josefsson  <simon@josefsson.org>
 
        * gnus-sum.el (gnus-get-newsgroup-headers): Search for "from:"

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index ef48ff9..7f7a3ee 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -4777,7 +4777,8 @@ The resulting hash table is returned, or nil if no Xrefs were found."
            ;; From.
            (progn
              (goto-char p)
-             (if (search-forward "\nfrom:" nil t)
+             (if (or (search-forward "\nfrom: " nil t)
+                     (search-forward "\nfrom:" nil t))
                  (nnheader-header-value)
                "(nobody)"))
            ;; Date.

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 0396036..777369e 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -231,7 +231,8 @@ This variable is a substitute for `mm-text-coding-system-for-write'.")
           ;; From.
           (progn
             (goto-char p)
-            (if (search-forward "\nfrom:" nil t)
+            (if (or (search-forward "\nfrom: " nil t)
+                    (search-forward "\nfrom:" nil t))
                 (nnheader-header-value) "(nobody)"))
           ;; Date.
           (progn