projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync up with Pteroductyl Gnus 0.62
[elisp/gnus.git-]
/
lisp
/
mm-decode.el
diff --git
a/lisp/mm-decode.el
b/lisp/mm-decode.el
index
f7653b6
..
7b0061f
100644
(file)
--- 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)))
(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)
("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)
"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))
(or (mm-handle-cache handle)
(mm-with-unibyte-buffer
(insert-buffer-substring (mm-handle-buffer handle))