diff options
| author | Eli Zaretskii <[email protected]> | 2010-09-23 15:18:30 -0400 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2010-09-23 15:18:30 -0400 |
| commit | fe3537c3a91491253a87f4d43540344d040c34e7 (patch) | |
| tree | 3b65c99f68a108c6eb7a54c8947f07874bfba0bf | |
| parent | 0350982fc522fc98d2a9807fd1c27b7de352f6b2 (diff) | |
Fix last changes in editfns.c and intervals.c.
editfns.c (clip_to_bounds): Return an EMACS_INT value.
lisp.h (clip_to_bounds): Adjust prototype.
intervals.c (adjust_for_invis_intang): Return EMACS_INT value.
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/editfns.c | 2 | ||||
| -rw-r--r-- | src/intervals.c | 2 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 199495a6c1..c8ea550e18 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2010-09-23 Eli Zaretskii <[email protected]> + + * editfns.c (clip_to_bounds): Return an EMACS_INT value. + + * lisp.h (clip_to_bounds): Adjust prototype. + + * intervals.c (adjust_for_invis_intang): Return EMACS_INT value. + 2010-09-23 Lars Magne Ingebrigtsen <[email protected]> * lisp.h: Change the definition of all marker.c functions that diff --git a/src/editfns.c b/src/editfns.c index d8be23a8f7..f7240e9919 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -272,7 +272,7 @@ DEFUN ("point-marker", Fpoint_marker, Spoint_marker, 0, 0, 0, return buildmark (PT, PT_BYTE); } -int +EMACS_INT clip_to_bounds (EMACS_INT lower, EMACS_INT num, EMACS_INT upper) { if (num < lower) diff --git a/src/intervals.c b/src/intervals.c index 421cce76db..5e08e13d23 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1926,7 +1926,7 @@ set_point (EMACS_INT charpos) Note that `stickiness' is determined by overlay marker insertion types, if the invisible property comes from an overlay. */ -static int +static EMACS_INT adjust_for_invis_intang (EMACS_INT pos, EMACS_INT test_offs, EMACS_INT adj, int test_intang) { diff --git a/src/lisp.h b/src/lisp.h index 16c92e9afe..5291719bea 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2991,7 +2991,7 @@ EXFUN (Fwiden, 0); EXFUN (Fuser_login_name, 1); EXFUN (Fsystem_name, 0); EXFUN (Fcurrent_time, 0); -extern int clip_to_bounds (EMACS_INT, EMACS_INT, EMACS_INT); +extern EMACS_INT clip_to_bounds (EMACS_INT, EMACS_INT, EMACS_INT); extern Lisp_Object make_buffer_string (EMACS_INT, EMACS_INT, int); extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int); |