procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More tweaks to ImageMagick types.

Browse source 
* lisp/image.el (imagemagick-types-inhibit): Revert last change.  Add
INFO and M.
(imagemagick-enabled-types): Remove EPS and related formats.
This commit is contained in:
Chong Yidong 2012-06-04 21:01:17 +08:00
parent 9c29597b23
commit 041df390e0
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2012-06-04 Chong Yidong <cyd@gnu.org>
* image.el (imagemagick-types-inhibit): Revert last change. Add
INFO and M.
(imagemagick-enabled-types): Remove EPS and related formats.
2012-06-04 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/cl-lib.el: Rename from cl.el.

19
lisp/image.el
View file

@ -750,7 +750,8 @@ If Emacs is compiled without ImageMagick support, this does nothing."
(push (cons re 'imagemagick) image-type-file-name-regexps)))
(setq imagemagick--file-regexp re))))
(defcustom imagemagick-types-inhibit nil
(defcustom imagemagick-types-inhibit
'(C HTML HTM INFO M TXT PDF)
"List of ImageMagick types that should never be treated as images.
This should be a list of symbols, each of which should be one of
the ImageMagick types listed by `imagemagick-types'. The listed
@ -775,14 +776,14 @@ has no effect."
(defcustom imagemagick-enabled-types
'(3FR ART ARW AVS BMP BMP2 BMP3 CAL CALS CIN CMYK CMYKA CR2 CRW
CUR CUT DCM DCR DCX DDS DJVU DNG DPX EPDF EPS EPS2 EPS3 EPSF
EPSI 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 PCT PCX PDB PEF PGM PICT PIX PJPEG
PNG PNG24 PNG32 PNG8 PNM PPM PSD PTIF PWP RAF RAS RBG RGB
RGBA RGBO RLA RLE SCR SCT SFW SGI SR2 SRF SUN SVG SVGZ TGA
TIFF TIFF64 TILE TIM TTF UYVY VDA VICAR VID VIFF VST WBMP WPG
X3F XBM XC XCF XPM XV XWD YCbCr YCbCrA YUV)
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
PCT PCX PDB PEF PGM PICT PIX PJPEG PNG PNG24 PNG32 PNG8 PNM
PPM PSD PTIF PWP RAF RAS RBG RGB RGBA RGBO RLA RLE SCR SCT
SFW SGI SR2 SRF SUN SVG SVGZ TGA TIFF TIFF64 TILE TIM TTF
UYVY VDA VICAR VID VIFF VST WBMP WPG X3F XBM XC XCF XPM XV
XWD YCbCr YCbCrA YUV)
"List of ImageMagick types to treat as images.
Each list element should be a string or symbol, representing one
of the image types returned by `imagemagick-types'. If the