image.el (imagemagick-enabled-types): Remove CIN.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d06afabd987179d6ccefe163dd7798423deb2aea..c707d3a444d783bfd77f7e3de37755d41df81b83 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,7 +2,7 @@
 
        * image.el (imagemagick-types-inhibit): Revert last change.  Add
        INFO and M.
-       (imagemagick-enabled-types): Remove EPS and related formats.
+       (imagemagick-enabled-types): Remove CIN and EPS*.
 
 2012-06-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/image.el b/lisp/image.el
index fc3c90e548d096d1e64f17276f8d1c6cb968532b..a47e945c26ab006de7fa075fbbeb69d0d3e4695a 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -775,7 +775,7 @@ has no effect."
   :group 'image)
 
 (defcustom imagemagick-enabled-types
-  '(3FR ART ARW AVS BMP BMP2 BMP3 CAL CALS CIN CMYK CMYKA CR2 CRW
+  '(3FR ART ARW AVS BMP BMP2 BMP3 CAL CALS CMYK CMYKA CR2 CRW
     CUR CUT DCM DCR DCX DDS DJVU DNG DPX EXR FAX FITS GBR GIF
     GIF87 GRB HRZ ICB ICO ICON J2C JNG JP2 JPC JPEG JPG JPX K25
     KDC MIFF MNG MRW MSL MSVG MTV NEF ORF OTB PBM PCD PCDS PCL