summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-02-06 19:46:18 -0800
committerGlenn Morris <rgm@gnu.org>2012-02-06 19:46:18 -0800
commitdd605cc4a63834731b278c92ac9719c8a67492ea (patch)
treeb8675fe27ce9bea03d450375c51d99c554d75a0b /lisp
parentaf008560fea31dff76f6d7df3e386cf2af623a8d (diff)
downloademacs-dd605cc4a63834731b278c92ac9719c8a67492ea.tar.gz
Small imagemagick doc fixes
* lisp/image.el (imagemagick-types-inhibit): Doc fix. * src/image.c (Fimagemagick_types): Doc fix.
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 @@
2012-02-07 Glenn Morris <rgm@gnu.org>
+ * image.el (imagemagick-types-inhibit): Doc fix.
+
* cus-start.el (imagemagick-render-type): Add it.
2012-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."
'(C HTML HTM TXT PDF)
"ImageMagick types that Emacs should not use ImageMagick to handle.
This should be a list of symbols, each of which has the same
-names as one of the format tags used internally by ImageMagick;
+name as one of the format tags used internally by ImageMagick;
see `imagemagick-types'. Entries in this list are excluded from
being registered by `imagemagick-register-types'.