X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmm-decode.el;h=7b0061f3a6b261a0c500850329a2b21eaf876af6;hb=446fe302d802f1656e1f1d425d3f737d13d1b2bd;hp=f7653b6fd33fc4b6b1a0e6272be0347fe99acc9a;hpb=c7fa55668ab3ada99c0a81c9ad7574ffd2c91095;p=elisp%2Fgnus.git-

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index f7653b6..7b0061f 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -67,6 +67,8 @@
 	  (eq (device-type) 'x)))
     ("image/xpm" mm-inline-image
      (and window-system (featurep 'xpm)))
+    ("image/x-pixmap" mm-inline-image
+     (and window-system (featurep 'xpm)))
     ("image/bmp" mm-inline-image
      (and window-system (featurep 'bmp)))
     ("text/plain" mm-inline-text t)
@@ -543,6 +545,12 @@ This overrides entries in the mailcap file."
   "Return an image instance based on HANDLE."
   (let ((type (cadr (split-string (car (mm-handle-type handle)) "/")))
 	spec)
+    ;; Allow some common translations.
+    (setq type
+	  (cond
+	   ((equal type "x-pixmap")
+	    "xpm")
+	   (t type)))
     (or (mm-handle-cache handle)
 	(mm-with-unibyte-buffer
 	  (insert-buffer-substring (mm-handle-buffer handle))