imagemagick-render-type fixes

* src/image.c (imagemagick-render-type): Change it from a lisp object
to an integer.  Move the doc here from the lisp manual.
Treat all values not equal to 0 the same.

* doc/lispref/display.texi (ImageMagick Images):
Move most details of imagemagick-render-type to the variable's doc.

* lisp/cus-start.el (imagemagick-render-type): Add it.

2 files changed, 8 insertions, 7 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5de2251c19f..163ab80e8b8 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * display.texi (ImageMagick Images):
+        Move most details of imagemagick-render-type to the variable's doc.
+
 2012-02-06  Glenn Morris  <rgm@gnu.org>
 
         * keymaps.texi (Tool Bar): Mention separators.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index e97e6c264a3..e1b2f57e507 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4543,14 +4543,10 @@ loader will be used in practice depends on the priority of the loaders).
 For example, if you never want to use the ImageMagick loader to use
 JPEG files, add @code{JPG} to this list.
 
+@c Not sure this should even be in the manual at all.
 @vindex imagemagick-render-type
-You can set the variable @code{imagemagick-render-type} to choose
-between screen render methods for the ImageMagick loader.  The options
-are: @code{0}, a conservative method which works with older
-@c FIXME details of this "newer method"?
-@c Presumably it is faster but may be less "robust"?
-ImageMagick versions (it is a bit slow, but robust); and @code{1},
-a newer ImageMagick method.
+If you wish to experiment with the performance of the ImageMagick
+loader, see the variable @code{imagemagick-render-type}.
 
 Images loaded with ImageMagick support a few new display specifications: