From 7c2621229f8a5a7b1a2773c6879aeed9003d80b8 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 8 Jan 2003 00:23:57 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog    |    4 ++++
 lisp/mm-decode.el |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eba7f92..9b6fc98 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-08  Jesper Harder  <harder@ifa.au.dk>
+
+	* mm-decode.el (mm-inline-media-tests): .xpm is 'x-xpixmap'.
+
 2003-01-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* nnrss.el (nnrss-group-alist): Add and clear up.
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index b343351..eef4d16 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1,5 +1,5 @@
 ;;; mm-decode.el --- Functions for decoding MIME things
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -178,7 +178,7 @@ consider all the urls to be safe."
      mm-inline-image
      (lambda (handle)
        (mm-valid-and-fit-image-p 'xpm handle)))
-    ("image/x-pixmap"
+    ("image/x-xpixmap"
      mm-inline-image
      (lambda (handle)
        (mm-valid-and-fit-image-p 'xpm handle)))
-- 
1.7.10.4