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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 199495a6c13403c0466d9b20d56215634f20c689..c8ea550e18c45cbd6bc85557a53eabfc624633e0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/editfns.c b/src/editfns.c
index d8be23a8f70e66520e33ceb1bcfefab8b6e9f902..f7240e99190a5550b7ab7b0b8405f0cdd353bbd2 100644 (file)
--- 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 421cce76db2ed980edb53dca08cefa84d374c556..5e08e13d23bfb4eeab0dd9bd52c2619bd984d63c 100644 (file)
--- 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 16c92e9afe5e6de7427e66a02d17fd8d416237fb..5291719bea880253cffd6403f69b612a73ac074a 100644 (file)
--- 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);