diff options
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/composite.h b/src/composite.h index 6a7e0a5e2c7..68f5b27ee42 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -223,8 +223,8 @@ extern Lisp_Object Qcomposition; | |||
| 223 | extern Lisp_Object composition_hash_table; | 223 | extern Lisp_Object composition_hash_table; |
| 224 | extern ptrdiff_t get_composition_id (ptrdiff_t, ptrdiff_t, ptrdiff_t, | 224 | extern ptrdiff_t get_composition_id (ptrdiff_t, ptrdiff_t, ptrdiff_t, |
| 225 | Lisp_Object, Lisp_Object); | 225 | Lisp_Object, Lisp_Object); |
| 226 | extern int find_composition (ptrdiff_t, ptrdiff_t, ptrdiff_t *, ptrdiff_t *, | 226 | extern bool find_composition (ptrdiff_t, ptrdiff_t, ptrdiff_t *, ptrdiff_t *, |
| 227 | Lisp_Object *, Lisp_Object); | 227 | Lisp_Object *, Lisp_Object); |
| 228 | extern void update_compositions (ptrdiff_t, ptrdiff_t, int); | 228 | extern void update_compositions (ptrdiff_t, ptrdiff_t, int); |
| 229 | extern void make_composition_value_copy (Lisp_Object); | 229 | extern void make_composition_value_copy (Lisp_Object); |
| 230 | extern void compose_region (int, int, Lisp_Object, Lisp_Object, | 230 | extern void compose_region (int, int, Lisp_Object, Lisp_Object, |
| @@ -310,17 +310,16 @@ struct font_metrics; | |||
| 310 | 310 | ||
| 311 | extern Lisp_Object composition_gstring_put_cache (Lisp_Object, ptrdiff_t); | 311 | extern Lisp_Object composition_gstring_put_cache (Lisp_Object, ptrdiff_t); |
| 312 | extern Lisp_Object composition_gstring_from_id (ptrdiff_t); | 312 | extern Lisp_Object composition_gstring_from_id (ptrdiff_t); |
| 313 | extern int composition_gstring_p (Lisp_Object); | 313 | extern bool composition_gstring_p (Lisp_Object); |
| 314 | extern int composition_gstring_width (Lisp_Object, ptrdiff_t, ptrdiff_t, | 314 | extern int composition_gstring_width (Lisp_Object, ptrdiff_t, ptrdiff_t, |
| 315 | struct font_metrics *); | 315 | struct font_metrics *); |
| 316 | 316 | ||
| 317 | extern void composition_compute_stop_pos (struct composition_it *, | 317 | extern void composition_compute_stop_pos (struct composition_it *, |
| 318 | ptrdiff_t, ptrdiff_t, ptrdiff_t, | 318 | ptrdiff_t, ptrdiff_t, ptrdiff_t, |
| 319 | Lisp_Object); | 319 | Lisp_Object); |
| 320 | extern int composition_reseat_it (struct composition_it *, | 320 | extern bool composition_reseat_it (struct composition_it *, ptrdiff_t, |
| 321 | ptrdiff_t, ptrdiff_t, ptrdiff_t, | 321 | ptrdiff_t, ptrdiff_t, struct window *, |
| 322 | struct window *, struct face *, | 322 | struct face *, Lisp_Object); |
| 323 | Lisp_Object); | ||
| 324 | extern int composition_update_it (struct composition_it *, | 323 | extern int composition_update_it (struct composition_it *, |
| 325 | ptrdiff_t, ptrdiff_t, Lisp_Object); | 324 | ptrdiff_t, ptrdiff_t, Lisp_Object); |
| 326 | 325 | ||