Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce9bebd..aade0cf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2002-02-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus-art.el (article-display-x-face): Don't sort multiple
+       X-Faces.
+
+2002-02-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Improved to speed
        up.  Suggested by Yuuichi Teranishi <teranisi@gohome.org>.
 

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b8401d4..0e96de8 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2066,7 +2066,9 @@ unfolded."
                                  x-faces))
                        (push (cons 0 (mail-header-field-value)) x-faces)))
                    (dolist (x-face (prog1
-                                       (sort x-faces 'car-less-than-car)
+                                       (if grey
+                                           (sort x-faces 'car-less-than-car)
+                                         (nreverse x-faces))
                                      (setq x-faces nil)))
                      (push (cdr x-face) x-faces)))
                (while (gnus-article-goto-header "X-Face")