diff options
| author | Glenn Morris | 2014-01-22 00:30:00 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-01-22 00:30:00 -0800 |
| commit | 7b997b14589f85f2987f45a99abb8cfa4cd8d390 (patch) | |
| tree | 8cd0f5d4c3a601deec6965fa20882d8bbfe420f0 /lisp | |
| parent | 44e76f9dd1ab4b37eef3702912a1e20f00353868 (diff) | |
| download | emacs-7b997b14589f85f2987f45a99abb8cfa4cd8d390.tar.gz emacs-7b997b14589f85f2987f45a99abb8cfa4cd8d390.zip | |
Some doc for image-format-suffixes
* doc/lispref/display.texi (ImageMagick Images):
Expand on image-format-suffixes.
* lisp/image.el (image-format-suffixes): Doc fix.
* etc/NEWS: Related markup.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/image.el | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 106e12e88b7..974cd2223ef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-01-22 Glenn Morris <rgm@gnu.org> | 1 | 2014-01-22 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * image.el (image-format-suffixes): Doc fix. | ||
| 4 | |||
| 3 | * international/quail.el (quail-define-package): Doc fix. | 5 | * international/quail.el (quail-define-package): Doc fix. |
| 4 | 6 | ||
| 5 | * emacs-lisp/authors.el (authors-valid-file-names): | 7 | * emacs-lisp/authors.el (authors-valid-file-names): |
diff --git a/lisp/image.el b/lisp/image.el index dec6991666a..d16fe4fb0ba 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -104,11 +104,13 @@ AUTODETECT can be | |||
| 104 | 104 | ||
| 105 | (defvar image-format-suffixes | 105 | (defvar image-format-suffixes |
| 106 | '((image/x-icon "ico")) | 106 | '((image/x-icon "ico")) |
| 107 | "Alist of MIME Content-Type headers to file name suffixes. | 107 | "An alist associating image types with file name suffixes. |
| 108 | This is used as a hint by the ImageMagick library when detecting | 108 | This is used as a hint by the ImageMagick library when detecting |
| 109 | image types. If `create-image' is called with a :format | 109 | the type of image data (that does not have an associated file name). |
| 110 | matching found in this alist, the ImageMagick library will be | 110 | Each element has the form (MIME-CONTENT-TYPE EXTENSION). |
| 111 | told that the data would have this suffix if saved to a file.") | 111 | If `create-image' is called with a :format attribute whose value |
| 112 | equals a content-type found in this list, the ImageMagick library is | ||
| 113 | told that the data would have the associated suffix if saved to a file.") | ||
| 112 | 114 | ||
| 113 | (defcustom image-load-path | 115 | (defcustom image-load-path |
| 114 | (list (file-name-as-directory (expand-file-name "images" data-directory)) | 116 | (list (file-name-as-directory (expand-file-name "images" data-directory)) |