2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f21d9e046e..c90d0ac7ea1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * cus-start.el (imagemagick-render-type): Add it.
+
 2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * progmodes/cc-mode.el
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2cee72d717e..a5032cf99e7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -237,6 +237,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             :set custom-set-minor-mode)
              ;; fringe.c
              (overflow-newline-into-fringe fringe boolean)
+             ;; image.c
+             (imagemagick-render-type image integer "24.1")
              ;; indent.c
              (indent-tabs-mode indent boolean)
              ;; keyboard.c
@@ -504,6 +506,8 @@ since it could result in memory overflow and make Emacs crash."
                        (fboundp 'x-selection-exists-p))
                       ((string-match "fringe" (symbol-name symbol))
                        (fboundp 'define-fringe-bitmap))
+                      ((string-match "\\`imagemagick" (symbol-name symbol))
+                       (fboundp 'imagemagick-types))
                       ((equal "font-use-system-font" (symbol-name symbol))
                        (featurep 'system-font-setting))
                       ;; Conditioned on x-create-frame, because that's