Fix int/EMACS_INT in eval.c and indent.c, correct previous changes.

 indent.c (Fcurrent_indentation, indented_beyond_p)
 (compute_motion): Use EMACS_INT for buffer position variables.
 lisp.h (indented_beyond_p): Adjust prototype.
 buffer.c (overlay_strings): Return EMACS_INT.
 buffer.h (overlay_strings): Adjust prototype.
 region-cache.c (pp_cache): Adjust format to arguments.
 eval.c <specpdl_size, lisp_eval_depth>: Declare EMACS_INT.
 (call_debugger): Use EMACS_INT for specpdl_size related variables.
 (verror): Use EMACS_INT for size of allocated buffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index e34f41f3edbb433f92532dcc56f8e0d3c33fa16b..94ae1496921b7774e34a1c1935aed2b6064e85a7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,20 @@
 2010-09-24  Eli Zaretskii  <eliz@gnu.org>
 
+       * indent.c (Fcurrent_indentation, indented_beyond_p)
+       (compute_motion): Use EMACS_INT for buffer position variables.
+
+       * lisp.h (indented_beyond_p): Adjust prototype.
+
+       * buffer.c (overlay_strings): Return EMACS_INT.
+
+       * buffer.h (overlay_strings): Adjust prototype.
+
+       * region-cache.c (pp_cache): Adjust format to arguments.
+
+       * eval.c <specpdl_size, lisp_eval_depth>: Declare EMACS_INT.
+       (call_debugger): Use EMACS_INT for specpdl_size related variables.
+       (verror): Use EMACS_INT for size of allocated buffer.
+
        * keyboard.c (make_lispy_position): Use EMACS_INT for buffer
        positions.
 

diff --git a/src/buffer.c b/src/buffer.c
index 7ac00aa25b49bf9b13937ffb8e3e4e79c0cbec95..3f087d62a5f388053347a3e0241fb6caac30ea63 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3134,7 +3134,7 @@ record_overlay_string (struct sortstrlist *ssl, Lisp_Object str, Lisp_Object str
    PSTR, if that variable is non-null.  The string may be overwritten by
    subsequent calls.  */
 
-int
+EMACS_INT
 overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
 {
   Lisp_Object overlay, window, str;

diff --git a/src/buffer.h b/src/buffer.h
index 339e7d9bb6dfc53a97a6748e48da6971e4957456..3a4dd1063607bf389e9f124b899ea409dd63cb4f 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -865,7 +865,7 @@ extern int overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr,
                         EMACS_INT *prev_ptr, int change_req);
 extern int sort_overlays (Lisp_Object *, int, struct window *);
 extern void recenter_overlay_lists (struct buffer *, EMACS_INT);
-extern int overlay_strings (EMACS_INT, struct window *, unsigned char **);
+extern EMACS_INT overlay_strings (EMACS_INT, struct window *, unsigned char **);
 extern void validate_region (Lisp_Object *, Lisp_Object *);
 extern void set_buffer_internal (struct buffer *);
 extern void set_buffer_internal_1 (struct buffer *);

diff --git a/src/eval.c b/src/eval.c
index 555d728b91f8a8a94ddb49d3ca49a59ca9bf0c73..d64d15040df51be0a2670839bd7c5ee26d2244b2 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -79,7 +79,7 @@ Lisp_Object Vautoload_queue;
 
 /* Current number of specbindings allocated in specpdl.  */
 
-int specpdl_size;
+EMACS_INT specpdl_size;
 
 /* Pointer to beginning of specpdl.  */
 
@@ -95,7 +95,7 @@ EMACS_INT max_specpdl_size;
 
 /* Depth in Lisp evaluations and function calls.  */
 
-int lisp_eval_depth;
+EMACS_INT lisp_eval_depth;
 
 /* Maximum allowed depth in Lisp evaluations and function calls.  */
 
@@ -216,7 +216,7 @@ call_debugger (Lisp_Object arg)
   int debug_while_redisplaying;
   int count = SPECPDL_INDEX ();
   Lisp_Object val;
-  int old_max = max_specpdl_size;
+  EMACS_INT old_max = max_specpdl_size;
 
   /* Temporarily bump up the stack limits,
      so the debugger won't run out of stack.  */
@@ -1992,7 +1992,7 @@ void
 verror (const char *m, va_list ap)
 {
   char buf[200];
-  int size = 200;
+  EMACS_INT size = 200;
   int mlen;
   char *buffer = buf;
   char *args[3];

diff --git a/src/indent.c b/src/indent.c
index 76163e2490573b8d3f81e5cc598e3bee1656e430..affcc222f0b83d1cb5cc6415a565bf947dcc0c39 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -865,7 +865,7 @@ following any initial whitespace.  */)
   (void)
 {
   Lisp_Object val;
-  int opoint = PT, opoint_byte = PT_BYTE;
+  EMACS_INT opoint = PT, opoint_byte = PT_BYTE;
 
   scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
 
@@ -964,10 +964,10 @@ position_indentation (register int pos_byte)
    preceding line.  */
 
 int
-indented_beyond_p (int pos, int pos_byte, double column)
+indented_beyond_p (EMACS_INT pos, EMACS_INT pos_byte, double column)
 {
   double val;
-  int opoint = PT, opoint_byte = PT_BYTE;
+  EMACS_INT opoint = PT, opoint_byte = PT_BYTE;
 
   SET_PT_BOTH (pos, pos_byte);
   while (PT > BEGV && FETCH_BYTE (PT_BYTE) == '\n')
@@ -1254,7 +1254,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_
               to be changed here.  */
            {
              unsigned char *ovstr;
-             int ovlen = overlay_strings (pos, win, &ovstr);
+             EMACS_INT ovlen = overlay_strings (pos, win, &ovstr);
              hpos += ((multibyte && ovlen > 0)
                       ? strwidth (ovstr, ovlen) : ovlen);
            }
@@ -1459,7 +1459,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_
              want to skip over it for some other reason.  */
           if (common_width != 0)
             {
-              int run_end_hpos;
+              EMACS_INT run_end_hpos;
 
               /* Don't go past the final buffer posn the user
                  requested.  */

diff --git a/src/lisp.h b/src/lisp.h
index 14f8617ce9ebc6aee1ad5eff6483727e40bfae8b..1d499e88cf4822258f9f4a6658bfaff36a178e17 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1877,7 +1877,7 @@ struct specbinding
 
 extern struct specbinding *specpdl;
 extern struct specbinding *specpdl_ptr;
-extern int specpdl_size;
+extern EMACS_INT specpdl_size;
 
 extern EMACS_INT max_specpdl_size;
 
@@ -3241,7 +3241,7 @@ EXFUN (Fcurrent_column, 0);
 EXFUN (Fmove_to_column, 2);
 extern double current_column (void);
 extern void invalidate_current_column (void);
-extern int indented_beyond_p (int, int, double);
+extern int indented_beyond_p (EMACS_INT, EMACS_INT, double);
 extern void syms_of_indent (void);
 
 /* Defined in frame.c */

diff --git a/src/region-cache.c b/src/region-cache.c
index b6c43359b1b38d7d73220ea8f240706891472fd9..9037b5df4b4190c2d33c3fdd1cac4d359ee299ea 100644 (file)
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -788,9 +788,9 @@ pp_cache (struct region_cache *c)
   EMACS_INT end_u = c->buffer_end - c->end_unchanged;
 
   fprintf (stderr,
-           "basis: %d..%d    modified: %d..%d\n",
-           c->buffer_beg, c->buffer_end,
-           beg_u, end_u);
+           "basis: %ld..%ld    modified: %ld..%ld\n",
+           (long)c->buffer_beg, (long)c->buffer_end,
+           (long)beg_u, (long)end_u);
 
   for (i = 0; i < c->cache_len; i++)
     {
@@ -804,7 +804,7 @@ pp_cache (struct region_cache *c)
              : (pos == end_u) ? '-'
              : ' '),
             stderr);
-      fprintf (stderr, "%d : %d\n", pos, BOUNDARY_VALUE (c, i));
+      fprintf (stderr, "%ld : %d\n", (long)pos, BOUNDARY_VALUE (c, i));
     }
 }