diff options
author | Eli Zaretskii <[email protected]> | 2010-09-23 10:32:38 -0400 |
---|---|---|
committer | Eli Zaretskii <[email protected]> | 2010-09-23 10:32:38 -0400 |
commit | 579c18d04a042e78bc85c1aef081e612acd6e757 (patch) | |
tree | 4e164342527219189d0d515bf3895e4cc3c8cd1d /src/character.h | |
parent | 141624691330c7622d9a31d53ec919dee8e97473 (diff) |
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.
Diffstat (limited to 'src/character.h')
-rw-r--r-- | src/character.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/character.h b/src/character.h index cbc4d6b312..aea1a47a1f 100644 --- a/src/character.h +++ b/src/character.h @@ -612,9 +612,11 @@ extern EMACS_INT str_to_multibyte (unsigned char *, EMACS_INT, EMACS_INT); extern EMACS_INT str_as_unibyte (unsigned char *, EMACS_INT); extern EMACS_INT str_to_unibyte (const unsigned char *, unsigned char *, EMACS_INT, int); -extern int strwidth (const unsigned char *, int); -extern int c_string_width (const unsigned char *, int, int, int *, int *); -extern int lisp_string_width (Lisp_Object, int, int *, int *); +extern EMACS_INT strwidth (const unsigned char *, EMACS_INT); +extern EMACS_INT c_string_width (const unsigned char *, EMACS_INT, int, + EMACS_INT *, EMACS_INT *); +extern EMACS_INT lisp_string_width (Lisp_Object, int, + EMACS_INT *, EMACS_INT *); extern Lisp_Object Vprintable_chars; |