Synch to Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e68f85..43e7c4e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-art.el (article-display-face): Get the Face header from
+       the current buffer.
+
 2003-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-mime-view-part-internally): Bind

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 93faac2..a3cae0a 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2050,11 +2050,7 @@ unfolded."
   "Display any Face headers in the header."
   (interactive)
   (gnus-with-article-headers
-    (let ((face nil))
-      (save-excursion
-       (when (gnus-buffer-live-p gnus-original-article-buffer)
-         (set-buffer gnus-original-article-buffer)
-         (setq face (message-fetch-field "face"))))
+    (let ((face (message-fetch-field "face")))
       (when face
        (let ((png (gnus-convert-face-to-png face))
              image)

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 804f229..f8379ef 100644 (file)
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -219,7 +219,7 @@ colors of the displayed X-Faces."
       (sleep-for 1))
     (setq file (car file))
     (shell-command
-     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | ppmnorm 2>/dev/null | ppmnorm | pnmscale -width 48 -height 48 > /tmp/gnus.face.ppm"
+     (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | ppmnorm 2>/dev/null | ppmnorm | ppmtopgm | pnmscale -width 48 -height 48 > /tmp/gnus.face.ppm"
             file))
     (let ((gnus-convert-image-to-face-command
           "cat '%s' | ppmquant %d | pnmtopng"))