Allow viewing .six images via image-convert

* lisp/files.el (auto-mode-alist): Support the Sixel .six image
format.  (Bug#63531)
* lisp/image.el (imagemagick-enabled-types): Add SIX.

(cherry picked from commit 7d41a23ad3b4c03ea1dea91eb70474f074dc05a4)

diff --git a/lisp/files.el b/lisp/files.el
index ff55054a62dbaeb151d61741d08977fec0675759..43b023fae6e0167fd8772626d1690e9996c2db2d 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3297,6 +3297,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\|SQUASHFS\\)\\'" .
      ("\\.pict\\'" . image-mode)
      ("\\.rgb\\'" . image-mode)
      ("\\.rgba\\'" . image-mode)
+     ("\\.six\\'" . image-mode)
      ("\\.tga\\'" . image-mode)
      ("\\.wbmp\\'" . image-mode)
      ("\\.webp\\'" . image-mode)

diff --git a/lisp/image.el b/lisp/image.el
index 3d60b485c6b094c4bde9981ec522dcfc5b850bb4..73842894390e48e2902f942fa3bc8acf1e150c68 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1174,7 +1174,7 @@ has no effect."
     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
+    SFW SGI SIX 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.