Mercurial > emacs

changeset 71365:245925ebe6d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(struct it): Add union to iterator stack to save image, composition, and stretch specific paramters.
author Kim F. Storm <storm@cua.dk>
date Fri, 16 Jun 2006 11:53:00 +0000
parents 844bc583e7e3
children 1a62b8cd2100
files src/dispextern.h
diffstat 1 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/dispextern.h	Fri Jun 16 11:52:48 2006 +0000
+++ b/src/dispextern.h	Fri Jun 16 11:53:00 2006 +0000
@@ -1932,7 +1932,21 @@
     int stop_charpos;
     int face_id;
     Lisp_Object string;
-    int image_id;
+    union {
+      struct {
+	Lisp_Object object;
+	struct it_slice slice;
+	int image_id;
+      } image;
+      struct {
+	Lisp_Object object;
+	int c, len;
+	int cmp_id, cmp_len;
+      } comp;
+      struct {
+	Lisp_Object object;
+      } stretch;
+    } u;
     struct display_pos pos;
     int end_charpos;
     int string_nchars;
@@ -1941,7 +1955,6 @@
     unsigned multibyte_p : 1;
     unsigned string_from_display_prop_p : 1;
     unsigned display_ellipsis_p : 1;
-    struct it_slice slice;
     Lisp_Object space_width;
     short voffset;
     Lisp_Object font_height;