diff options
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/composite.h b/src/composite.h index 60145b10bd9..39e82ad74ad 100644 --- a/src/composite.h +++ b/src/composite.h @@ -186,7 +186,7 @@ struct composition { enum composition_method method; /* Index to the composition hash table. */ - EMACS_INT hash_index; + ptrdiff_t hash_index; /* For which font we have calculated the remaining members. The actual type is device dependent. */ @@ -216,16 +216,16 @@ extern ptrdiff_t n_compositions; extern Lisp_Object Qcomposition; extern Lisp_Object composition_hash_table; -extern ptrdiff_t get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, +extern ptrdiff_t get_composition_id (ptrdiff_t, ptrdiff_t, ptrdiff_t, Lisp_Object, Lisp_Object); -extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, +extern int find_composition (ptrdiff_t, ptrdiff_t, ptrdiff_t *, ptrdiff_t *, Lisp_Object *, Lisp_Object); -extern void update_compositions (EMACS_INT, EMACS_INT, int); +extern void update_compositions (ptrdiff_t, ptrdiff_t, int); extern void make_composition_value_copy (Lisp_Object); extern void compose_region (int, int, Lisp_Object, Lisp_Object, Lisp_Object); extern void syms_of_composite (void); -extern void compose_text (EMACS_INT, EMACS_INT, Lisp_Object, Lisp_Object, +extern void compose_text (ptrdiff_t, ptrdiff_t, Lisp_Object, Lisp_Object, Lisp_Object); /* Macros for lispy glyph-string. This is completely different from @@ -298,22 +298,22 @@ struct composition_it; struct face; struct font_metrics; -extern Lisp_Object composition_gstring_put_cache (Lisp_Object, EMACS_INT); +extern Lisp_Object composition_gstring_put_cache (Lisp_Object, ptrdiff_t); extern Lisp_Object composition_gstring_from_id (ptrdiff_t); extern int composition_gstring_p (Lisp_Object); -extern int composition_gstring_width (Lisp_Object, EMACS_INT, EMACS_INT, +extern int composition_gstring_width (Lisp_Object, ptrdiff_t, ptrdiff_t, struct font_metrics *); extern void composition_compute_stop_pos (struct composition_it *, - EMACS_INT, EMACS_INT, EMACS_INT, + ptrdiff_t, ptrdiff_t, ptrdiff_t, Lisp_Object); extern int composition_reseat_it (struct composition_it *, - EMACS_INT, EMACS_INT, EMACS_INT, + ptrdiff_t, ptrdiff_t, ptrdiff_t, struct window *, struct face *, Lisp_Object); extern int composition_update_it (struct composition_it *, - EMACS_INT, EMACS_INT, Lisp_Object); + ptrdiff_t, ptrdiff_t, Lisp_Object); -extern EMACS_INT composition_adjust_point (EMACS_INT, EMACS_INT); +extern ptrdiff_t composition_adjust_point (ptrdiff_t, ptrdiff_t); #endif /* not EMACS_COMPOSITE_H */ |