# HG changeset patch
# User Lars Magne Ingebrigtsen <larsi@gnus.org>
# Date 1285275468 -7200
# Node ID 6248bcadfd21726e63d4ed7d434fb2a195f72abb
# Parent  8e5fcc5dd96bd5d92485f4cc99bb08aef67f5b90
Cast SPECPDL_INDEX to int, and do further EMACS_INT/int cleanups.

diff -r 8e5fcc5dd96b -r 6248bcadfd21 src/ChangeLog
--- a/src/ChangeLog	Thu Sep 23 22:16:55 2010 +0200
+++ b/src/ChangeLog	Thu Sep 23 22:57:48 2010 +0200
@@ -1,5 +1,10 @@
 2010-09-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* lisp.h (SPECPDL_INDEX): Cast to int, since we're not going to
+	unwind_protect more than 2GB worth of functions.
+
+	* editfns.c (Finsert_char): EMACS_INT/int cleanup.
+
 	* lisp.h: Have oblookup take EMACS_INT to allow interning big
 	string and avoid compiler warnings.
 	(USE_SAFE_ALLOCA): Cast to int to avoid compilation warnings in
diff -r 8e5fcc5dd96b -r 6248bcadfd21 src/editfns.c
--- a/src/editfns.c	Thu Sep 23 22:16:55 2010 +0200
+++ b/src/editfns.c	Thu Sep 23 22:57:48 2010 +0200
@@ -2270,7 +2270,7 @@
   (Lisp_Object character, Lisp_Object count, Lisp_Object inherit)
 {
   register unsigned char *string;
-  register int strlen;
+  register EMACS_INT strlen;
   register int i;
   register EMACS_INT n;
   int len;
@@ -2955,7 +2955,7 @@
   register unsigned char *tt;	/* Trans table. */
   register int nc;		/* New character. */
   int cnt;			/* Number of changes made. */
-  int size;			/* Size of translate table. */
+  EMACS_INT size;		/* Size of translate table. */
   EMACS_INT pos, pos_byte, end_pos;
   int multibyte = !NILP (current_buffer->enable_multibyte_characters);
   int string_multibyte;
@@ -3026,7 +3026,7 @@
 	    }
 	  else
 	    {
-	      int c;
+	      EMACS_INT c;
 
 	      nc = oc;
 	      val = CHAR_TABLE_REF (table, oc);
@@ -3239,7 +3239,7 @@
 	/* The restriction has changed from the saved one, so restore
 	   the saved restriction.  */
 	{
-	  int pt = BUF_PT (buf);
+	  EMACS_INT pt = BUF_PT (buf);
 
 	  SET_BUF_BEGV_BOTH (buf, beg->charpos, beg->bytepos);
 	  SET_BUF_ZV_BOTH (buf, end->charpos, end->bytepos);
diff -r 8e5fcc5dd96b -r 6248bcadfd21 src/lisp.h
--- a/src/lisp.h	Thu Sep 23 22:16:55 2010 +0200
+++ b/src/lisp.h	Thu Sep 23 22:57:48 2010 +0200
@@ -1881,7 +1881,7 @@
 
 extern EMACS_INT max_specpdl_size;
 
-#define SPECPDL_INDEX()	(specpdl_ptr - specpdl)
+#define SPECPDL_INDEX()	((int) (specpdl_ptr - specpdl))
 
 /* Everything needed to describe an active condition case.  */
 struct handler