Mercurial > emacs
changeset 110512:ba79df773e8d
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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Thu, 23 Sep 2010 15:18:30 -0400 |
| parents | 5746a646bb03 |
| children | 43adca79c8fd |
| files | src/ChangeLog src/editfns.c src/intervals.c src/lisp.h |
| diffstat | 4 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Sep 23 21:12:18 2010 +0200 +++ b/src/ChangeLog Thu Sep 23 15:18:30 2010 -0400 @@ -1,3 +1,11 @@ +2010-09-23 Eli Zaretskii <eliz@gnu.org> + + * 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 <larsi@gnus.org> * lisp.h: Change the definition of all marker.c functions that
--- a/src/editfns.c Thu Sep 23 21:12:18 2010 +0200 +++ b/src/editfns.c Thu Sep 23 15:18:30 2010 -0400 @@ -272,7 +272,7 @@ return buildmark (PT, PT_BYTE); } -int +EMACS_INT clip_to_bounds (EMACS_INT lower, EMACS_INT num, EMACS_INT upper) { if (num < lower)
--- a/src/intervals.c Thu Sep 23 21:12:18 2010 +0200 +++ b/src/intervals.c Thu Sep 23 15:18:30 2010 -0400 @@ -1926,7 +1926,7 @@ 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) {
--- a/src/lisp.h Thu Sep 23 21:12:18 2010 +0200 +++ b/src/lisp.h Thu Sep 23 15:18:30 2010 -0400 @@ -2991,7 +2991,7 @@ 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);