diff options
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/src/composite.h b/src/composite.h index 6a5bf92b05d..9559700d382 100644 --- a/src/composite.h +++ b/src/composite.h @@ -212,16 +212,17 @@ extern Lisp_Object Vauto_composition_function; extern Lisp_Object Qauto_composition_function; extern Lisp_Object Vcomposition_function_table; -extern int get_composition_id P_ ((int, int, int, Lisp_Object, Lisp_Object)); -extern int find_composition P_ ((int, int, EMACS_INT *, EMACS_INT *, Lisp_Object *, - Lisp_Object)); -extern void update_compositions P_ ((EMACS_INT, EMACS_INT, int)); -extern void make_composition_value_copy P_ ((Lisp_Object)); -extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object, - Lisp_Object)); -extern void syms_of_composite P_ ((void)); -extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object, - Lisp_Object)); +extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, + Lisp_Object, Lisp_Object); +extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, + Lisp_Object *, Lisp_Object); +extern void update_compositions (EMACS_INT, EMACS_INT, 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, + Lisp_Object); /* Macros for lispy glyph-string. This is completely different from struct glyph_string. */ @@ -303,26 +304,24 @@ struct composition_it; struct face; struct font_metrics; -extern Lisp_Object composition_gstring_put_cache P_ ((Lisp_Object, int)); -extern Lisp_Object composition_gstring_from_id P_ ((int)); -extern int composition_gstring_p P_ ((Lisp_Object)); -extern int composition_gstring_width P_ ((Lisp_Object, int, int, - struct font_metrics *)); - -extern void composition_compute_stop_pos P_ ((struct composition_it *, - EMACS_INT, EMACS_INT, EMACS_INT, - Lisp_Object)); -extern int composition_reseat_it P_ ((struct composition_it *, - EMACS_INT, EMACS_INT, EMACS_INT, - struct window *, struct face *, - Lisp_Object)); -extern int composition_update_it P_ ((struct composition_it *, - EMACS_INT, EMACS_INT, Lisp_Object)); - -extern int composition_adjust_point P_ ((EMACS_INT, EMACS_INT)); - -EXFUN (Fcompose_region_internal, 4); -EXFUN (Fcompose_string_internal, 5); +extern Lisp_Object composition_gstring_put_cache (Lisp_Object, int); +extern Lisp_Object composition_gstring_from_id (int); +extern int composition_gstring_p (Lisp_Object); +extern int composition_gstring_width (Lisp_Object, EMACS_INT, EMACS_INT, + struct font_metrics *); + +extern void composition_compute_stop_pos (struct composition_it *, + EMACS_INT, EMACS_INT, EMACS_INT, + Lisp_Object); +extern int composition_reseat_it (struct composition_it *, + EMACS_INT, EMACS_INT, EMACS_INT, + struct window *, struct face *, + Lisp_Object); +extern int composition_update_it (struct composition_it *, + EMACS_INT, EMACS_INT, Lisp_Object); + +extern EMACS_INT composition_adjust_point (EMACS_INT, EMACS_INT); + EXFUN (Fcomposition_get_gstring, 4); #endif /* not EMACS_COMPOSITE_H */ |