aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/image.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c90d0ac7ea1..66025e2ec91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-02-07 Glenn Morris <rgm@gnu.org> 12012-02-07 Glenn Morris <rgm@gnu.org>
2 2
3 * image.el (imagemagick-types-inhibit): Doc fix.
4
3 * cus-start.el (imagemagick-render-type): Add it. 5 * cus-start.el (imagemagick-render-type): Add it.
4 6
52012-02-06 Lars Ingebrigtsen <larsi@gnus.org> 72012-02-06 Lars Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/image.el b/lisp/image.el
index c4b51716dad..53df590b091 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -686,7 +686,7 @@ The minimum delay between successive frames is 0.01s."
686 '(C HTML HTM TXT PDF) 686 '(C HTML HTM TXT PDF)
687 "ImageMagick types that Emacs should not use ImageMagick to handle. 687 "ImageMagick types that Emacs should not use ImageMagick to handle.
688This should be a list of symbols, each of which has the same 688This should be a list of symbols, each of which has the same
689names as one of the format tags used internally by ImageMagick; 689name as one of the format tags used internally by ImageMagick;
690see `imagemagick-types'. Entries in this list are excluded from 690see `imagemagick-types'. Entries in this list are excluded from
691being registered by `imagemagick-register-types'. 691being registered by `imagemagick-register-types'.
692 692