From 946a79d0f7c71262aec6db474cac6050c4c29b7c Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 13 Jun 2006 22:45:21 +0000 Subject: [PATCH] (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. --- src/dispextern.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/dispextern.h b/src/dispextern.h index 6654e8beb5a..e975a1676e2 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1819,6 +1819,8 @@ enum it_method { 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 @@ struct it 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 @@ struct it short voffset; Lisp_Object font_height; } - stack[2]; + stack[IT_STACK_SIZE]; /* Stack pointer. */ int sp; -- 2.39.5