Mercurial > emacs
changeset 71338:cb9b414fad75
(IT_STACK_SIZE): New macro specifying size of
iterator stack (instead of hardcoded number). Increase from 2 to 4
to make room for propertized overlay strings before and after a
display string, image or composition.
(struct it): Add image_id and method members to iterator stack.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Tue, 13 Jun 2006 22:45:21 +0000 |
| parents | 7128a9839095 |
| children | 0c8a94363573 |
| files | src/dispextern.h |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/dispextern.h Tue Jun 13 22:45:00 2006 +0000 +++ b/src/dispextern.h Tue Jun 13 22:45:21 2006 +0000 @@ -1819,6 +1819,8 @@ NUM_IT_METHODS }; +#define IT_STACK_SIZE 4 + struct it { /* The window in which we iterate over current_buffer (or a string). */ @@ -1930,10 +1932,12 @@ int stop_charpos; int face_id; Lisp_Object string; + int image_id; struct display_pos pos; int end_charpos; int string_nchars; enum glyph_row_area area; + enum it_method method; unsigned multibyte_p : 1; unsigned string_from_display_prop_p : 1; unsigned display_ellipsis_p : 1; @@ -1942,7 +1946,7 @@ short voffset; Lisp_Object font_height; } - stack[2]; + stack[IT_STACK_SIZE]; /* Stack pointer. */ int sp;