(DEFAULT_IMAGE_HEIGHT): New macro.

(IMAGE_ASCENT): Removed.

diff --git a/src/dispextern.h b/src/dispextern.h
index ad32c70360f4e2175707d26566e2efc70cf7c4c3..c5dd55b3a98552787119c2855b79c9ef80341041 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1917,9 +1917,12 @@ struct image
 #define DEFAULT_IMAGE_WIDTH 30
 #define DEFAULT_IMAGE_HEIGHT 30
 
-  /* Percent of image height used as ascent.  */
+  /* Percent of image height used as ascent.  A value of
+     CENTERED_IMAGE_ASCENT means draw center the image centered on the
+     line.  */
   int ascent;
 #define DEFAULT_IMAGE_ASCENT 50
+#define CENTERED_IMAGE_ASCENT -1
 
   /* Lisp specification of this image.  */
   Lisp_Object spec;
@@ -1980,11 +1983,6 @@ struct image_cache
 };
 
 
-/* Value is the ascent of image IMG.  */
-
-#define IMAGE_ASCENT(IMG) \
-     (((IMG)->height + (IMG)->margin) * (IMG)->ascent / 100.0)
-
 /* Value is a pointer to the image with id ID on frame F, or null if
    no image with that id exists.  */