aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/image.el8
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 @@
12013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * image.el (image-content-type-suffixes): New variable.
4
12013-08-13 Fabián Ezequiel Gallina <fgallina@gnu.org> 52013-08-13 Fabián Ezequiel Gallina <fgallina@gnu.org>
2 6
3 * progmodes/python.el (python-imenu--build-tree) 7 * 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
99 - maybe auto-detect only if the image type is available 99 - maybe auto-detect only if the image type is available
100 (see `image-type-available-p').") 100 (see `image-type-available-p').")
101 101
102(defvar image-content-type-suffixes
103 '((image/x-icon "ico"))
104 "Alist of MIME Content-Type headers to file name suffixes.
105This is used as a hint by the ImageMagick library when detecting
106image types. If `create-image' is called with a :content-type
107matching found in this alist, the ImageMagick library will be
108told that the data would have this suffix if saved to a file.")
109
102(defcustom image-load-path 110(defcustom image-load-path
103 (list (file-name-as-directory (expand-file-name "images" data-directory)) 111 (list (file-name-as-directory (expand-file-name "images" data-directory))
104 'data-directory 'load-path) 112 'data-directory 'load-path)