merge from trunk

2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11e5e913398..c6f11fec11a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * image.el (image-content-type-suffixes): New variable.
+
 2013-08-13  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         * progmodes/python.el (python-imenu--build-tree)
diff --git a/lisp/image.el b/lisp/image.el
index 804dc3af5ea..de69490f5b6 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -99,6 +99,14 @@ AUTODETECT can be
  - maybe  auto-detect only if the image type is available
             (see `image-type-available-p').")
 
+(defvar image-content-type-suffixes
+  '((image/x-icon "ico"))
+  "Alist of MIME Content-Type headers to file name suffixes.
+This is used as a hint by the ImageMagick library when detecting
+image types.  If `create-image' is called with a :content-type
+matching found in this alist, the ImageMagick library will be
+told that the data would have this suffix if saved to a file.")
+
 (defcustom image-load-path
   (list (file-name-as-directory (expand-file-name "images" data-directory))
         'data-directory 'load-path)