Commit faf8b5bc authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen
Browse files

Cast SPECPDL_INDEX to int, and do further EMACS_INT/int cleanups.

parent 40283062
2010-09-23 Lars Magne Ingebrigtsen <larsi@gnus.org> 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 * lisp.h: Have oblookup take EMACS_INT to allow interning big
string and avoid compiler warnings. string and avoid compiler warnings.
(USE_SAFE_ALLOCA): Cast to int to avoid compilation warnings in (USE_SAFE_ALLOCA): Cast to int to avoid compilation warnings in
......
...@@ -2270,7 +2270,7 @@ from adjoining text, if those properties are sticky. */) ...@@ -2270,7 +2270,7 @@ from adjoining text, if those properties are sticky. */)
(Lisp_Object character, Lisp_Object count, Lisp_Object inherit) (Lisp_Object character, Lisp_Object count, Lisp_Object inherit)
{ {
register unsigned char *string; register unsigned char *string;
register int strlen; register EMACS_INT strlen;
register int i; register int i;
register EMACS_INT n; register EMACS_INT n;
int len; int len;
...@@ -2955,7 +2955,7 @@ It returns the number of characters changed. */) ...@@ -2955,7 +2955,7 @@ It returns the number of characters changed. */)
register unsigned char *tt; /* Trans table. */ register unsigned char *tt; /* Trans table. */
register int nc; /* New character. */ register int nc; /* New character. */
int cnt; /* Number of changes made. */ 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; EMACS_INT pos, pos_byte, end_pos;
int multibyte = !NILP (current_buffer->enable_multibyte_characters); int multibyte = !NILP (current_buffer->enable_multibyte_characters);
int string_multibyte; int string_multibyte;
...@@ -3026,7 +3026,7 @@ It returns the number of characters changed. */) ...@@ -3026,7 +3026,7 @@ It returns the number of characters changed. */)
} }
else else
{ {
int c; EMACS_INT c;
nc = oc; nc = oc;
val = CHAR_TABLE_REF (table, oc); val = CHAR_TABLE_REF (table, oc);
...@@ -3239,7 +3239,7 @@ save_restriction_restore (Lisp_Object data) ...@@ -3239,7 +3239,7 @@ save_restriction_restore (Lisp_Object data)
/* The restriction has changed from the saved one, so restore /* The restriction has changed from the saved one, so restore
the saved restriction. */ 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_BEGV_BOTH (buf, beg->charpos, beg->bytepos);
SET_BUF_ZV_BOTH (buf, end->charpos, end->bytepos); SET_BUF_ZV_BOTH (buf, end->charpos, end->bytepos);
......
...@@ -1881,7 +1881,7 @@ extern int specpdl_size; ...@@ -1881,7 +1881,7 @@ extern int specpdl_size;
extern EMACS_INT max_specpdl_size; 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. */ /* Everything needed to describe an active condition case. */
struct handler struct handler
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment