aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-06 19:46:18 -0800
committerGlenn Morris2012-02-06 19:46:18 -0800
commitdd605cc4a63834731b278c92ac9719c8a67492ea (patch)
treeb8675fe27ce9bea03d450375c51d99c554d75a0b
parentaf008560fea31dff76f6d7df3e386cf2af623a8d (diff)
downloademacs-dd605cc4a63834731b278c92ac9719c8a67492ea.tar.gz
emacs-dd605cc4a63834731b278c92ac9719c8a67492ea.zip
Small imagemagick doc fixes
* lisp/image.el (imagemagick-types-inhibit): Doc fix. * src/image.c (Fimagemagick_types): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/image.el2
-rw-r--r--src/ChangeLog2
-rw-r--r--src/image.c1
4 files changed, 6 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
diff --git a/src/ChangeLog b/src/ChangeLog
index 6438f054432..5e4d995d857 100644
--- a/src/ChangeLog
+++ b/src/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.c (Fimagemagick_types): Doc fix.
4
3 * image.c (imagemagick-render-type): Change it from a lisp object 5 * image.c (imagemagick-render-type): Change it from a lisp object
4 to an integer. Move the doc here from the lisp manual. 6 to an integer. Move the doc here from the lisp manual.
5 Treat all values not equal to 0 the same. 7 Treat all values not equal to 0 the same.
diff --git a/src/image.c b/src/image.c
index 21f97c32a0c..b2951dd70fb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7983,6 +7983,7 @@ DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0,
7983Each entry in this list is a symbol named after an ImageMagick format 7983Each entry in this list is a symbol named after an ImageMagick format
7984tag. See the ImageMagick manual for a list of ImageMagick formats and 7984tag. See the ImageMagick manual for a list of ImageMagick formats and
7985their descriptions (http://www.imagemagick.org/script/formats.php). 7985their descriptions (http://www.imagemagick.org/script/formats.php).
7986You can also try the shell command: `identify -list format'.
7986 7987
7987Note that ImageMagick recognizes many file-types that Emacs does not 7988Note that ImageMagick recognizes many file-types that Emacs does not
7988recognize as images, such as C. See `imagemagick-types-inhibit'. */) 7989recognize as images, such as C. See `imagemagick-types-inhibit'. */)