summaryrefslogtreecommitdiff
path: root/src/composite.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-09-25 05:36:36 -0400
committerEli Zaretskii <eliz@gnu.org>2010-09-25 05:36:36 -0400
commit41118bd30dd303cf60a70990c5347a6cfdfca1ef (patch)
treea8161184b75d6d25b31578a78ef9fae56625fe74 /src/composite.c
parentf5276b757f179ca3a97565344072422da5697c68 (diff)
downloademacs-41118bd30dd303cf60a70990c5347a6cfdfca1ef.tar.gz
Fix int/EMACS_INT use in keyboard.c.
keyboard.c <last_point_position, last_non_minibuf_size>: Declare EMACS_INT. (echo_truncate, adjust_point_for_property, read_char) (gen_help_event, make_lispy_event, modify_event_symbol) (Fexecute_extended_command, stuff_buffered_input): Use EMACS_INT for buffer positions and string length. keyboard.h (gen_help_event): Adjust prototype. termhooks.h <struct input_event>: Make `code' member EMACS_INT. commands.h <last_point_position>: Declare EMACS_INT. xdisp.c <help_echo_pos>: Define as EMACS_INT. (truncate_echo_area): Accept EMACS_INT argument. dispextern.h <help_echo_pos>: Declare EMACS_INT. lisp.h (truncate_echo_area): Adjust prototype. composite.c (composition_adjust_point): Return EMACS_INT. composite.h (composition_adjust_point): Adjust prototype.
Diffstat (limited to 'src/composite.c')
-rw-r--r--src/composite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.c b/src/composite.c
index 8849f5274b0..be9aafbeacc 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1662,7 +1662,7 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit, EMACS_INT *start, EM
/* Return the adjusted point provided that point is moved from LAST_PT
to NEW_PT. */
-int
+EMACS_INT
composition_adjust_point (EMACS_INT last_pt, EMACS_INT new_pt)
{
EMACS_INT charpos, bytepos, startpos, beg, end, pos;