[Emacs-diffs] trunk r113856: Rename :content-type to :format in `create-image'

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113856
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 22:13:02 +0200
message:
  Rename :content-type to :format in `create-image'
modified:
  doc/lispref/display.texi       
display.texi-20091113204419-o5vbwnq5f7feedwu-6172
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/image.el                  image.el-20091113204419-o5vbwnq5f7feedwu-1320
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2013-08-13 17:45:34 +0000
+++ b/doc/lispref/display.texi  2013-08-13 20:13:02 +0000
@@ -4664,12 +4664,12 @@
 wish.  @code{:max-width} and @code{:max-height} will always preserve
 the aspect ratio.
 
address@hidden :content-type
address@hidden :format
 ImageMagick tries to auto-detect the image type, but it isn't always
-able to.  By using @code{:content-type}, we can give ImageMagick a
-hint to try to help it.  It's used in conjuction with the
address@hidden variable, which provides a mapping
-from content types to file name suffixes.  This is then given to
+able to.  By using @code{:format-type}, we can give ImageMagick a hint
+to try to help it.  It's used in conjuction with the
address@hidden variable, which provides a mapping from
+content types to file name suffixes.  This is then given to
 ImageMagick as a file name hint.
 
 @item :rotation

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-08-13 17:45:34 +0000
+++ b/etc/NEWS  2013-08-13 20:13:02 +0000
@@ -897,8 +897,8 @@
 keywords.
 
 *** Some data types aren't auto-detected by ImageMagick.  Adding
-:content-type to `create-image' may help if the content type is in the
-new variable `image-content-type-suffixes'.
+:format to `create-image' may help if the content type is in the
+new variable `image-format-suffixes'.
 
 ** Minibuffer
 

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2013-08-13 17:45:34 +0000
+++ b/lisp/image.el     2013-08-13 20:13:02 +0000
@@ -99,11 +99,11 @@
  - maybe  auto-detect only if the image type is available
            (see `image-type-available-p').")
 
-(defvar image-content-type-suffixes
+(defvar image-format-suffixes
   '((image/x-icon "ico"))
   "Alist of MIME Content-Type headers to file name suffixes.
 This is used as a hint by the ImageMagick library when detecting
-image types.  If `create-image' is called with a :content-type
+image types.  If `create-image' is called with a :format
 matching found in this alist, the ImageMagick library will be
 told that the data would have this suffix if saved to a file.")
 

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-08-13 18:09:50 +0000
+++ b/lisp/net/shr.el   2013-08-13 20:13:02 +0000
@@ -747,7 +747,7 @@
             (image (cond
                     ((eq size 'original)
                      (create-image data nil t :ascent 100
-                                   :content-type content-type))
+                                   :format content-type))
                     ((eq size 'full)
                      (ignore-errors
                        (shr-rescale-image data t content-type)))
@@ -791,7 +791,7 @@
                               (- (nth 2 edges) (nth 0 edges))))
        :max-height (truncate (* shr-max-image-proportion
                                (- (nth 3 edges) (nth 1 edges))))
-       :content-type content-type))))
+       :format content-type))))
 
 ;; url-cache-extract autoloads url-cache.
 (declare-function url-cache-create-filename "url-cache" (url))

=== modified file 'src/image.c'
--- a/src/image.c       2013-08-13 18:24:37 +0000
+++ b/src/image.c       2013-08-13 20:13:02 +0000
@@ -551,7 +551,6 @@
 static Lisp_Object QCcolor_symbols;
 static Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry;
 static Lisp_Object QCcrop, QCrotation;
-static Lisp_Object QCcontent_type;
 
 /* Other symbols.  */
 
@@ -7741,7 +7740,7 @@
     IMAGEMAGICK_WIDTH,
     IMAGEMAGICK_MAX_HEIGHT,
     IMAGEMAGICK_MAX_WIDTH,
-    IMAGEMAGICK_CONTENT_TYPE,
+    IMAGEMAGICK_FORMAT,
     IMAGEMAGICK_ROTATION,
     IMAGEMAGICK_CROP,
     IMAGEMAGICK_LAST
@@ -7766,7 +7765,7 @@
     {":width",         IMAGE_INTEGER_VALUE,                    0},
     {":max-height",    IMAGE_INTEGER_VALUE,                    0},
     {":max-width",     IMAGE_INTEGER_VALUE,                    0},
-    {":content-type",  IMAGE_SYMBOL_VALUE,                     0},
+    {":format",                IMAGE_SYMBOL_VALUE,                     0},
     {":rotation",      IMAGE_NUMBER_VALUE,                     0},
     {":crop",          IMAGE_DONT_CHECK_VALUE_TYPE,            0}
   };
@@ -7851,15 +7850,15 @@
 static char*
 imagemagick_filename_hint (Lisp_Object spec)
 {
-  Lisp_Object content_type = image_spec_value (spec, QCcontent_type, NULL);
-  Lisp_Object symbol = intern ("image-content-type-suffixes");
+  Lisp_Object format = image_spec_value (spec, intern (":format"), NULL);
+  Lisp_Object symbol = intern ("image-format-suffixes");
   Lisp_Object val;
   char *name, *prefix = "/tmp/foo.";
 
   if (NILP (Fboundp (symbol)))
     return NULL;
 
-  val = Fassq (content_type, Fsymbol_value (symbol));
+  val = Fassq (format, Fsymbol_value (symbol));
   if (! CONSP (val))
     return NULL;
 
@@ -9155,7 +9154,6 @@
   DEFSYM (Qpostscript, "postscript");
   DEFSYM (QCmax_width, ":max-width");
   DEFSYM (QCmax_height, ":max-height");
-  DEFSYM (QCcontent_type, ":content-type");
 #ifdef HAVE_GHOSTSCRIPT
   ADD_IMAGE_TYPE (Qpostscript);
   DEFSYM (QCloader, ":loader");