Mercurial > emacs
comparison src/dispextern.h @ 71365:245925ebe6d0
(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 | cb9b414fad75 |
children | d108fd44c6fc 138027c8c982 |
comparison
equal
deleted
inserted
replaced
71364:844bc583e7e3 | 71365:245925ebe6d0 |
---|---|
1930 struct iterator_stack_entry | 1930 struct iterator_stack_entry |
1931 { | 1931 { |
1932 int stop_charpos; | 1932 int stop_charpos; |
1933 int face_id; | 1933 int face_id; |
1934 Lisp_Object string; | 1934 Lisp_Object string; |
1935 int image_id; | 1935 union { |
1936 struct { | |
1937 Lisp_Object object; | |
1938 struct it_slice slice; | |
1939 int image_id; | |
1940 } image; | |
1941 struct { | |
1942 Lisp_Object object; | |
1943 int c, len; | |
1944 int cmp_id, cmp_len; | |
1945 } comp; | |
1946 struct { | |
1947 Lisp_Object object; | |
1948 } stretch; | |
1949 } u; | |
1936 struct display_pos pos; | 1950 struct display_pos pos; |
1937 int end_charpos; | 1951 int end_charpos; |
1938 int string_nchars; | 1952 int string_nchars; |
1939 enum glyph_row_area area; | 1953 enum glyph_row_area area; |
1940 enum it_method method; | 1954 enum it_method method; |
1941 unsigned multibyte_p : 1; | 1955 unsigned multibyte_p : 1; |
1942 unsigned string_from_display_prop_p : 1; | 1956 unsigned string_from_display_prop_p : 1; |
1943 unsigned display_ellipsis_p : 1; | 1957 unsigned display_ellipsis_p : 1; |
1944 struct it_slice slice; | |
1945 Lisp_Object space_width; | 1958 Lisp_Object space_width; |
1946 short voffset; | 1959 short voffset; |
1947 Lisp_Object font_height; | 1960 Lisp_Object font_height; |
1948 } | 1961 } |
1949 stack[IT_STACK_SIZE]; | 1962 stack[IT_STACK_SIZE]; |