aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/image.c1
2 files changed, 3 insertions, 0 deletions
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'. */)