Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a67b9c..b9a3f8c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-02-26 11:27:27  Paul Jarc  <prj@po.cwru.edu>
+       Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-util.el (gnus-split-references): Handle malformed References:.
+
+2001-02-26 08:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (gnus-article-mime-part-status): 1 part.
+
 2001-02-25 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        From NAGY Andras <nagya@inf.elte.hu>.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 724a92b..e3b3d84 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3628,9 +3628,14 @@ value of the variable `gnus-show-mime' is non-nil."
 
 (defun gnus-article-mime-part-status ()
   (with-current-buffer gnus-article-buffer
-    (let ((entity (get-text-property (point-min) 'mime-view-entity)))
-      (if (and entity (mime-entity-children entity))
-         (format " (%d parts)" (length (mime-entity-children entity)))
+    (let ((entity (get-text-property (point-min) 'mime-view-entity))
+         children)
+      (if (and entity
+              (setq children (mime-entity-children entity))
+              (setq children (length children)))
+         (if (eq 1 children)
+             " (1 part)"
+           (format " (%d parts)" children))
        ""))))
 
 (defvar gnus-mime-button-map

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index c9b2d58..3405b91 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -414,7 +414,7 @@ jabbering all the time."
   "Return a list of Message-IDs in REFERENCES."
   (let ((beg 0)
        ids)
-    (while (string-match "<[^>]+>" references beg)
+    (while (string-match "<[^> \t]+>" references beg)
       (push (substring references (match-beginning 0) (setq beg (match-end 0)))
            ids))
     (nreverse ids)))