Mercurial > emacs
comparison src/composite.h @ 110504:0fdd992ff057
Fix more uses of int instead of EMACS_INT.
xdisp.c (check_point_in_composition, reconsider_clip_changes):
Use EMACS_INT for buffer position variables and arguments.
composite.c (get_composition_id, find_composition)
(run_composition_function, compose_text)
(composition_gstring_width, autocmp_chars)
(composition_update_it, Ffind_composition_internal): Use EMACS_INT
for buffer positions and string length variables and arguments.
composite.h (get_composition_id, find_composition, compose_text)
(composition_gstring_width): Adjust prototypes.
editfns.c (Fformat): Use EMACS_INT for string size variables.
xdisp.c (store_mode_line_noprop, display_mode_element): Use
EMACS_INT for string positions.
intervals.c (get_property_and_range): Use EMACS_INT for buffer
position arguments.
intervals.h (get_property_and_range): Adjust prototype.
character.c (parse_str_as_multibyte, str_as_multibyte)
(parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
(string_count_byte8, string_escape_byte8, c_string_width)
(strwidth, lisp_string_width, multibyte_chars_in_text): Use
EMACS_INT for string length variables and arguments.
(string_escape_byte8): Protect against too long strings.
character.h (parse_str_as_multibyte, str_as_multibyte)
(parse_str_to_multibyte, str_to_multibyte, str_as_unibyte)
(c_string_width, strwidth, lisp_string_width): Adjust
prototypes.
lisp.h (check_point_in_composition): Adjust prototype.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 23 Sep 2010 10:32:38 -0400 |
| parents | e16f43875a48 |
| children | 9c63d46e000c |
comparison
equal
deleted
inserted
replaced
| 110503:fda36a325177 | 110504:0fdd992ff057 |
|---|---|
| 210 extern Lisp_Object Qauto_composed; | 210 extern Lisp_Object Qauto_composed; |
| 211 extern Lisp_Object Vauto_composition_function; | 211 extern Lisp_Object Vauto_composition_function; |
| 212 extern Lisp_Object Qauto_composition_function; | 212 extern Lisp_Object Qauto_composition_function; |
| 213 extern Lisp_Object Vcomposition_function_table; | 213 extern Lisp_Object Vcomposition_function_table; |
| 214 | 214 |
| 215 extern int get_composition_id (int, int, int, Lisp_Object, Lisp_Object); | 215 extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, |
| 216 extern int find_composition (int, int, EMACS_INT *, EMACS_INT *, Lisp_Object *, | 216 Lisp_Object, Lisp_Object); |
| 217 Lisp_Object); | 217 extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, |
| 218 Lisp_Object *, Lisp_Object); | |
| 218 extern void update_compositions (EMACS_INT, EMACS_INT, int); | 219 extern void update_compositions (EMACS_INT, EMACS_INT, int); |
| 219 extern void make_composition_value_copy (Lisp_Object); | 220 extern void make_composition_value_copy (Lisp_Object); |
| 220 extern void compose_region (int, int, Lisp_Object, Lisp_Object, | 221 extern void compose_region (int, int, Lisp_Object, Lisp_Object, |
| 221 Lisp_Object); | 222 Lisp_Object); |
| 222 extern void syms_of_composite (void); | 223 extern void syms_of_composite (void); |
| 223 extern void compose_text (int, int, Lisp_Object, Lisp_Object, | 224 extern void compose_text (EMACS_INT, EMACS_INT, Lisp_Object, Lisp_Object, |
| 224 Lisp_Object); | 225 Lisp_Object); |
| 225 | 226 |
| 226 /* Macros for lispy glyph-string. This is completely different from | 227 /* Macros for lispy glyph-string. This is completely different from |
| 227 struct glyph_string. */ | 228 struct glyph_string. */ |
| 228 | 229 |
| 304 struct font_metrics; | 305 struct font_metrics; |
| 305 | 306 |
| 306 extern Lisp_Object composition_gstring_put_cache (Lisp_Object, int); | 307 extern Lisp_Object composition_gstring_put_cache (Lisp_Object, int); |
| 307 extern Lisp_Object composition_gstring_from_id (int); | 308 extern Lisp_Object composition_gstring_from_id (int); |
| 308 extern int composition_gstring_p (Lisp_Object); | 309 extern int composition_gstring_p (Lisp_Object); |
| 309 extern int composition_gstring_width (Lisp_Object, int, int, | 310 extern int composition_gstring_width (Lisp_Object, EMACS_INT, EMACS_INT, |
| 310 struct font_metrics *); | 311 struct font_metrics *); |
| 311 | 312 |
| 312 extern void composition_compute_stop_pos (struct composition_it *, | 313 extern void composition_compute_stop_pos (struct composition_it *, |
| 313 EMACS_INT, EMACS_INT, EMACS_INT, | 314 EMACS_INT, EMACS_INT, EMACS_INT, |
| 314 Lisp_Object); | 315 Lisp_Object); |