diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-04 19:19:34 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-04 19:19:34 -0700 |
| commit | 0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3 (patch) | |
| tree | 5f09676e1b87f3f274a60fe79728f84a3d0c9a9b /src/dispextern.h | |
| parent | 0065d05491ce5981ea20896bb26d21dcd31e6769 (diff) | |
| parent | e504613cc63d2a3925c546177a04637e25a1a4ae (diff) | |
Merge from trunk.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index c43eeb5560..4976131018 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1869,6 +1869,8 @@ struct bidi_it { bidi_dir_t paragraph_dir; /* current paragraph direction */ EMACS_INT separator_limit; /* where paragraph separator should end */ EMACS_INT disp_pos; /* position of display string after ch */ + int disp_prop_p; /* if non-zero, there really is a + `display' property/string at disp_pos */ unsigned first_elt : 1; /* if non-zero, examine current char first */ unsigned new_paragraph : 1; /* if non-zero, we expect a new paragraph */ unsigned frame_window_p : 1; /* non-zero if displaying on a GUI frame */ @@ -3036,7 +3038,8 @@ extern Lisp_Object lookup_glyphless_char_display (int, struct it *); extern int calc_pixel_width_or_height (double *, struct it *, Lisp_Object, struct font *, int, int *); extern EMACS_INT compute_display_string_pos (struct text_pos *, - struct bidi_string_data *, int); + struct bidi_string_data *, + int, int *); extern EMACS_INT compute_display_string_end (EMACS_INT, struct bidi_string_data *); |